From owner-svn-src-head@FreeBSD.ORG  Fri Jan  7 23:19:13 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 CA0F61065674;
	Fri,  7 Jan 2011 23:19:13 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B99848FC18;
	Fri,  7 Jan 2011 23:19:13 +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 p07NJDE1069036;
	Fri, 7 Jan 2011 23:19:13 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p07NJD9S069034;
	Fri, 7 Jan 2011 23:19:13 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201101072319.p07NJD9S069034@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Fri, 7 Jan 2011 23:19:13 +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: r217131 - head/sys/dev/ixgbe
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: Fri, 07 Jan 2011 23:19:13 -0000

Author: jfv
Date: Fri Jan  7 23:19:13 2011
New Revision: 217131
URL: http://svn.freebsd.org/changeset/base/217131

Log:
  kern/150247  - virtualization code also needs fix for 7.X to be buildable...
  
  MFC in 3 days

Modified:
  head/sys/dev/ixgbe/ixv.h

Modified: head/sys/dev/ixgbe/ixv.h
==============================================================================
--- head/sys/dev/ixgbe/ixv.h	Fri Jan  7 23:11:19 2011	(r217130)
+++ head/sys/dev/ixgbe/ixv.h	Fri Jan  7 23:19:13 2011	(r217131)
@@ -400,7 +400,7 @@ struct adapter {
 #define IXV_TX_LOCK_ASSERT(_sc)         mtx_assert(&(_sc)->tx_mtx, MA_OWNED)
 
 /* Workaround to make 8.0 buildable */
-#if __FreeBSD_version < 800504
+#if __FreeBSD_version >= 800000 && __FreeBSD_version < 800504
 static __inline int
 drbr_needs_enqueue(struct ifnet *ifp, struct buf_ring *br)
 {