From owner-svn-src-all@FreeBSD.ORG  Sat Feb 15 07:57:02 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 614B869B;
 Sat, 15 Feb 2014 07:57:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CFEA103C;
 Sat, 15 Feb 2014 07:57:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1F7v2PQ088398;
 Sat, 15 Feb 2014 07:57:02 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1F7v2Op088397;
 Sat, 15 Feb 2014 07:57:02 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201402150757.s1F7v2Op088397@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 15 Feb 2014 07:57:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261911 - head/sys/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Feb 2014 07:57:02 -0000

Author: adrian
Date: Sat Feb 15 07:57:01 2014
New Revision: 261911
URL: http://svnweb.freebsd.org/changeset/base/261911

Log:
  Make sure that the flowtable flowid is only set to m_flowid if there
  isn't one already supplied.
  
  The previous flowtable code also did this.
  
  Reviewed by:	glebius
  Sponsored by:	Netflix, Inc.

Modified:
  head/sys/net/flowtable.c

Modified: head/sys/net/flowtable.c
==============================================================================
--- head/sys/net/flowtable.c	Sat Feb 15 07:01:45 2014	(r261910)
+++ head/sys/net/flowtable.c	Sat Feb 15 07:57:01 2014	(r261911)
@@ -1002,7 +1002,7 @@ flowtable_lookup_common(struct flowtable
 	}
 
 success:
-	if (m->m_flags & M_FLOWID) {
+	if (! (m->m_flags & M_FLOWID)) {
 		m->m_flags |= M_FLOWID;
 		m->m_pkthdr.flowid = fle->f_fhash;
 	}