From owner-svn-src-head@FreeBSD.ORG Fri Jan 7 22:58:13 2011 Return-Path: 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 367FA106566B; Fri, 7 Jan 2011 22:58: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 2613D8FC15; Fri, 7 Jan 2011 22:58: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 p07MwDId068511; Fri, 7 Jan 2011 22:58:13 GMT (envelope-from jfv@svn.freebsd.org) Received: (from jfv@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p07MwDJK068509; Fri, 7 Jan 2011 22:58:13 GMT (envelope-from jfv@svn.freebsd.org) Message-Id: <201101072258.p07MwDJK068509@svn.freebsd.org> From: Jack F Vogel Date: Fri, 7 Jan 2011 22:58: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: r217129 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Jan 2011 22:58:13 -0000 Author: jfv Date: Fri Jan 7 22:58:12 2011 New Revision: 217129 URL: http://svn.freebsd.org/changeset/base/217129 Log: Fix to kern/150247 - make ixgbe buildable for 7.x Modified: head/sys/dev/ixgbe/ixgbe.h Modified: head/sys/dev/ixgbe/ixgbe.h ============================================================================== --- head/sys/dev/ixgbe/ixgbe.h Fri Jan 7 22:57:31 2011 (r217128) +++ head/sys/dev/ixgbe/ixgbe.h Fri Jan 7 22:58:12 2011 (r217129) @@ -484,7 +484,7 @@ ixgbe_is_sfp(struct ixgbe_hw *hw) } /* 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) {