From owner-svn-src-stable-10@FreeBSD.ORG  Wed Oct 22 04:01:27 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C8FA288B;
 Wed, 22 Oct 2014 04:01:27 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B4B42CCB;
 Wed, 22 Oct 2014 04:01:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9M41RlW090851;
 Wed, 22 Oct 2014 04:01:27 GMT (envelope-from bryanv@FreeBSD.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9M41RRY090850;
 Wed, 22 Oct 2014 04:01:27 GMT (envelope-from bryanv@FreeBSD.org)
Message-Id: <201410220401.s9M41RRY090850@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bryanv set sender to
 bryanv@FreeBSD.org using -f
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Wed, 22 Oct 2014 04:01:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r273450 - stable/10/sys/sys
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Oct 2014 04:01:27 -0000

Author: bryanv
Date: Wed Oct 22 04:01:27 2014
New Revision: 273450
URL: https://svnweb.freebsd.org/changeset/base/273450

Log:
  MFC r272796:
  
  Add M_FLOWID to M_COPYFLAGS
  
  The M_FLOWID flag should be propagated to the new mbuf pkthdr in
  m_move_pkthdr() and m_dup_pkthdr(). The new mbuf already got the
  existing flowid value, but would be ignored since the flag was
  not set.

Modified:
  stable/10/sys/sys/mbuf.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/sys/mbuf.h
==============================================================================
--- stable/10/sys/sys/mbuf.h	Wed Oct 22 03:39:11 2014	(r273449)
+++ stable/10/sys/sys/mbuf.h	Wed Oct 22 04:01:27 2014	(r273450)
@@ -247,7 +247,7 @@ struct mbuf {
  * Flags preserved when copying m_pkthdr.
  */
 #define M_COPYFLAGS \
-    (M_PKTHDR|M_EOR|M_RDONLY|M_BCAST|M_MCAST|M_VLANTAG|M_PROMISC| \
+    (M_PKTHDR|M_EOR|M_RDONLY|M_BCAST|M_MCAST|M_PROMISC|M_VLANTAG|M_FLOWID| \
      M_PROTOFLAGS)
 
 /*