svn commit: r284526 - head/sys/netinet
Michael Tuexen
tuexen at FreeBSD.org
Wed Jun 17 19:26:24 UTC 2015
Author: tuexen
Date: Wed Jun 17 19:26:23 2015
New Revision: 284526
URL: https://svnweb.freebsd.org/changeset/base/284526
Log:
Fix a bug related to flow assignment I introduce in
https://svnweb.freebsd.org/base?view=revision&revision=275483
MFC after: 3 days
Modified:
head/sys/netinet/sctp_input.c
Modified: head/sys/netinet/sctp_input.c
==============================================================================
--- head/sys/netinet/sctp_input.c Wed Jun 17 19:13:13 2015 (r284525)
+++ head/sys/netinet/sctp_input.c Wed Jun 17 19:26:23 2015 (r284526)
@@ -2676,8 +2676,9 @@ sctp_handle_cookie_echo(struct mbuf *m,
/* 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
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
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);
More information about the svn-src-all
mailing list