From owner-svn-src-stable-10@FreeBSD.ORG Tue Feb 10 13:43:24 2015 Return-Path: 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 407B07C6; Tue, 10 Feb 2015 13:43:24 +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 2B106F1B; Tue, 10 Feb 2015 13:43:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1ADhOua009761; Tue, 10 Feb 2015 13:43:24 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1ADhOkI009760; Tue, 10 Feb 2015 13:43:24 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201502101343.t1ADhOkI009760@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 10 Feb 2015 13:43:24 +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: r278514 - stable/10/sys/netinet 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Feb 2015 13:43:24 -0000 Author: hselasky Date: Tue Feb 10 13:43:23 2015 New Revision: 278514 URL: https://svnweb.freebsd.org/changeset/base/278514 Log: Append to the MFC of r278103 that we also pass along the M_FLOWID flag. Sponsored by: Mellanox Technologies Modified: stable/10/sys/netinet/ip_output.c Modified: stable/10/sys/netinet/ip_output.c ============================================================================== --- stable/10/sys/netinet/ip_output.c Tue Feb 10 13:36:37 2015 (r278513) +++ stable/10/sys/netinet/ip_output.c Tue Feb 10 13:43:23 2015 (r278514) @@ -801,8 +801,8 @@ smart_frag_failure: /* make sure the flowid is the same for the fragmented mbufs */ M_HASHTYPE_SET(m, M_HASHTYPE_GET(m0)); m->m_pkthdr.flowid = m0->m_pkthdr.flowid; - /* copy multicast flag, if any */ - m->m_flags |= (m0->m_flags & M_MCAST); + /* copy multicast and flowid flags, if any */ + m->m_flags |= (m0->m_flags & (M_MCAST | M_FLOWID)); /* * In the first mbuf, leave room for the link header, then * copy the original IP header including options. The payload