From owner-svn-src-head@FreeBSD.ORG  Mon Feb  7 08:12:25 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A2501065670;
	Mon,  7 Feb 2011 08:12:25 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 496128FC14;
	Mon,  7 Feb 2011 08:12:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p178CP7o002106;
	Mon, 7 Feb 2011 08:12:25 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p178CPBO002104;
	Mon, 7 Feb 2011 08:12:25 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <201102070812.p178CPBO002104@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 7 Feb 2011 08:12:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218393 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Feb 2011 08:12:25 -0000

Author: rrs
Date: Mon Feb  7 08:12:24 2011
New Revision: 218393
URL: http://svn.freebsd.org/changeset/base/218393

Log:
  If not set (due to some error Michael is working on
  fixing) set it for the net.
  
  MFC after:	3 months

Modified:
  head/sys/netinet/sctp_output.c

Modified: head/sys/netinet/sctp_output.c
==============================================================================
--- head/sys/netinet/sctp_output.c	Mon Feb  7 08:10:29 2011	(r218392)
+++ head/sys/netinet/sctp_output.c	Mon Feb  7 08:12:24 2011	(r218393)
@@ -3485,6 +3485,12 @@ sctp_lowlevel_chunk_output(struct sctp_i
 		SCTP_BUF_NEXT(newm) = m;
 		m = newm;
 		if (net != NULL) {
+			if (net->flowidset == 0) {
+				net->flowid = stcb->asoc.my_vtag ^
+				    ntohs(stcb->rport) ^
+				    ntohs(stcb->sctp_ep->sctp_lport);
+				net->flowidset = 1;
+			}
 			m->m_pkthdr.flowid = net->flowid;
 			m->m_flags |= M_FLOWID;
 		} else {
@@ -3815,6 +3821,12 @@ sctp_lowlevel_chunk_output(struct sctp_i
 		SCTP_BUF_NEXT(newm) = m;
 		m = newm;
 		if (net != NULL) {
+			if (net->flowidset == 0) {
+				net->flowid = stcb->asoc.my_vtag ^
+				    ntohs(stcb->rport) ^
+				    ntohs(stcb->sctp_ep->sctp_lport);
+				net->flowidset = 1;
+			}
 			m->m_pkthdr.flowid = net->flowid;
 			m->m_flags |= M_FLOWID;
 		} else {