From owner-freebsd-amd64@FreeBSD.ORG Fri Sep 3 14:40:05 2010 Return-Path: Delivered-To: freebsd-amd64@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E05310656CA for ; Fri, 3 Sep 2010 14:40:05 +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 413798FC21 for ; Fri, 3 Sep 2010 14:40:05 +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 o83Ee5o1060115 for ; Fri, 3 Sep 2010 14:40:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o83Ee5PP060114; Fri, 3 Sep 2010 14:40:05 GMT (envelope-from gnats) Resent-Date: Fri, 3 Sep 2010 14:40:05 GMT Resent-Message-Id: <201009031440.o83Ee5PP060114@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-amd64@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andrew Boyer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 557691065801 for ; Fri, 3 Sep 2010 14:36:57 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 445F18FC13 for ; Fri, 3 Sep 2010 14:36:57 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o83EavrQ014437 for ; Fri, 3 Sep 2010 14:36:57 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o83Eauge014436; Fri, 3 Sep 2010 14:36:56 GMT (envelope-from nobody) Message-Id: <201009031436.o83Eauge014436@www.freebsd.org> Date: Fri, 3 Sep 2010 14:36:56 GMT From: Andrew Boyer To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: amd64/150247: [patch] [ixgbe] Version in -current won't build on 7.x systems X-BeenThere: freebsd-amd64@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting FreeBSD to the AMD64 platform List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Sep 2010 14:40:05 -0000 >Number: 150247 >Category: amd64 >Synopsis: [patch] [ixgbe] Version in -current won't build on 7.x systems >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-amd64 >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Sep 03 14:40:04 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Andrew Boyer >Release: 7.1p3 >Organization: Avere Systems >Environment: N/A >Description: ixgbe.h added a version of drbr_needs_enqueue() for versions < 800504. This breaks on systems < 800000 because buf_ring_empty() isn't defined in that case. The #if should require version >= 800000. >How-To-Repeat: Pull the ixgbe driver from -current into a 7.x branch and build. >Fix: Patch attached with submission follows: --- ixgbe.h 2010-09-03 10:32:19.000000000 -0400 +++ ixgbe.h 2010-09-03 10:32:52.000000000 -0400 @@ -477,7 +477,7 @@ } /* 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) { >Release-Note: >Audit-Trail: >Unformatted: