diff options
| author | tuexen <tuexen@FreeBSD.org> | 2015-06-20 08:28:47 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2015-06-20 08:28:47 +0000 |
| commit | 094ec02dc8b783e4e68794c847da90049af29806 (patch) | |
| tree | 029814c670b2b1b29b4909fd14e3b78a826a4e27 /sys/netinet | |
| parent | 103d48d60e51144677efde9f37ee95451df279b3 (diff) | |
| download | FreeBSD-src-094ec02dc8b783e4e68794c847da90049af29806.zip FreeBSD-src-094ec02dc8b783e4e68794c847da90049af29806.tar.gz | |
MFC r284526:
Fix a bug related to flow assignment I introduced in
https://svnweb.freebsd.org/base?view=revision&revision=275483
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/sctp_input.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index 1fcca92..099742f 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -2676,8 +2676,9 @@ sctp_handle_cookie_echo(struct mbuf *m, int iphlen, int offset, /* still no TCB... must be bad cookie-echo */ return (NULL); } - if ((*netp != NULL) && (mflowtype != M_HASHTYPE_NONE)) { + if (*netp != NULL) { (*netp)->flowtype = mflowtype; + (*netp)->flowid = mflowid; } /* * Ok, we built an association so confirm the address we sent the @@ -5662,8 +5663,9 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt net->port = port; } #endif - if ((net != NULL) && (mflowtype != M_HASHTYPE_NONE)) { + if (net != NULL) { net->flowtype = mflowtype; + net->flowid = mflowid; } if ((inp != NULL) && (stcb != NULL)) { sctp_send_packet_dropped(stcb, net, m, length, iphlen, 1); @@ -5692,8 +5694,9 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt net->port = port; } #endif - if ((net != NULL) && (mflowtype != M_HASHTYPE_NONE)) { + if (net != NULL) { net->flowtype = mflowtype; + net->flowid = mflowid; } if (inp == NULL) { SCTP_STAT_INCR(sctps_noport); |
