amd64/150247: [patch] [ixgbe] Version in -current won't build on 7.x systems

[Andrew Boyer]

>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: