From owner-freebsd-net@FreeBSD.ORG  Fri Jan  7 19:00:23 2011
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
Delivered-To: freebsd-net@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BB31B106566B
	for <freebsd-net@hub.freebsd.org>; Fri,  7 Jan 2011 19:00:23 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id AA3278FC12
	for <freebsd-net@hub.freebsd.org>; Fri,  7 Jan 2011 19:00:23 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p07J0NbV062064
	for <freebsd-net@freefall.freebsd.org>; Fri, 7 Jan 2011 19:00:23 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p07J0Nm7062045;
	Fri, 7 Jan 2011 19:00:23 GMT (envelope-from gnats)
Date: Fri, 7 Jan 2011 19:00:23 GMT
Message-Id: <201101071900.p07J0Nm7062045@freefall.freebsd.org>
To: freebsd-net@FreeBSD.org
From: Andrew Boyer <aboyer@averesystems.com>
Cc: 
Subject: Re: kern/150247: [patch] [ixgbe] Version in -current won't build on
	7.x systems
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Andrew Boyer <aboyer@averesystems.com>
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Jan 2011 19:00:23 -0000

The following reply was made to PR kern/150247; it has been noted by GNATS.

From: Andrew Boyer <aboyer@averesystems.com>
To: bug-followup@FreeBSD.org,
 Andrew Boyer <aboyer@averesystems.com>
Cc:  
Subject: Re: kern/150247: [patch] [ixgbe] Version in -current won't build on 7.x systems
Date: Fri, 7 Jan 2011 13:36:15 -0500

 The problem has spread to the new file ixv.h:
 
 --- ixv.h	2010-11-26 17:46:32.000000000 -0500
 +++ ixv.h	2011-01-07 13:08:45.000000000 -0500
 @@ -175,7 +175,11 @@
  #define VFTA_SIZE			128
 =20
  /* Offload bits in mbuf flag */
 +#if __FreeBSD_version >=3D 800000
  #define CSUM_OFFLOAD		(CSUM_IP|CSUM_TCP|CSUM_UDP|CSUM_SCTP)
 +#else
 +#define CSUM_OFFLOAD		(CSUM_IP|CSUM_TCP|CSUM_UDP)
 +#endif
 =20
  /*
   =
 **************************************************************************=
 ***
 @@ -400,7 +404,7 @@
  #define IXV_TX_LOCK_ASSERT(_sc)         mtx_assert(&(_sc)->tx_mtx, =
 MA_OWNED)
 =20
  /* Workaround to make 8.0 buildable */
 -#if __FreeBSD_version < 800504
 +#if __FreeBSD_version >=3D 800000 && __FreeBSD_version < 800504
  static __inline int
  drbr_needs_enqueue(struct ifnet *ifp, struct buf_ring *br)
  {