svn commit: r284634 - stable/10/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sat Jun 20 08:28:47 2015
New Revision: 284634
URL: https://svnweb.freebsd.org/changeset/base/284634

Log:
  MFC r284526:
  Fix a bug related to flow assignment I introduced in
  https://svnweb.freebsd.org/base?view=revision&revision=275483

Modified:
  stable/10/sys/netinet/sctp_input.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/sctp_input.c
==============================================================================
--- stable/10/sys/netinet/sctp_input.c	Sat Jun 20 08:25:27 2015	(r284633)
+++ stable/10/sys/netinet/sctp_input.c	Sat Jun 20 08:28:47 2015	(r284634)
@@ -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);