From owner-svn-src-head@freebsd.org  Wed Jul 15 01:01:20 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 124D299C855;
 Wed, 15 Jul 2015 01:01:20 +0000 (UTC)
 (envelope-from hiren@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 CF9FA19B3;
 Wed, 15 Jul 2015 01:01:19 +0000 (UTC)
 (envelope-from hiren@FreeBSD.org)
Received: from svnmir.geo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6F11IlH046708;
 Wed, 15 Jul 2015 01:01:18 GMT (envelope-from hiren@FreeBSD.org)
Received: (from hiren@localhost)
 by svnmir.geo.freebsd.org (8.14.9/8.14.9/Submit) id t6F11INR046707;
 Wed, 15 Jul 2015 01:01:18 GMT (envelope-from hiren@FreeBSD.org)
Message-Id: <201507150101.t6F11INR046707@svnmir.geo.freebsd.org>
X-Authentication-Warning: svnmir.geo.freebsd.org: hiren set sender to
 hiren@FreeBSD.org using -f
From: Hiren Panchasara <hiren@FreeBSD.org>
Date: Wed, 15 Jul 2015 01:01:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285591 - head/sys/dev/ixgbe
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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: Wed, 15 Jul 2015 01:01:20 -0000

Author: hiren
Date: Wed Jul 15 01:01:17 2015
New Revision: 285591
URL: https://svnweb.freebsd.org/changeset/base/285591

Log:
  Remove FreeBSD version check for deprecated M_FLOWID.
  
  Reviewed by:	    erj
  Sponsored by:	    Limelight Networks

Modified:
  head/sys/dev/ixgbe/ix_txrx.c

Modified: head/sys/dev/ixgbe/ix_txrx.c
==============================================================================
--- head/sys/dev/ixgbe/ix_txrx.c	Wed Jul 15 00:35:50 2015	(r285590)
+++ head/sys/dev/ixgbe/ix_txrx.c	Wed Jul 15 01:01:17 2015	(r285591)
@@ -210,11 +210,7 @@ ixgbe_mq_start(struct ifnet *ifp, struct
 	 * If everything is setup correctly, it should be the
 	 * same bucket that the current CPU we're on is.
 	 */
-#if __FreeBSD_version < 1100054
-	if (m->m_flags & M_FLOWID) {
-#else
 	if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) {
-#endif
 #ifdef	RSS
 		if (rss_hash2bucket(m->m_pkthdr.flowid,
 		    M_HASHTYPE_GET(m), &bucket_id) == 0)