kern/119767: if_em fix for systems without msix support

[David Yeske]

>Number:         119767
>Category:       kern
>Synopsis:       if_em fix for systems without msix support
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 18 06:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     David Yeske
>Release:        6.2-RELEASE or RELENG_6 before 602111
>Organization:
>Environment:
FreeBSD devbox 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Jan 12 11:05:30 UTC 2007     root at dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP  i386

>Description:
The if_em driver has conditional statements so that it can support versions of FreeBSD before 602111.  There is a missing conditional statement in if_em.c that prevents a compiler warning which becomes an error while compiling the kernel.
>How-To-Repeat:
Try and compile the if_em driver in RELENG_6 on a system that is older than 602111.
>Fix:
Apply the attached fix to RELENG_6

Patch attached with submission follows:

Index: if_em.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/em/if_em.c,v
retrieving revision 1.65.2.30
diff -u -r1.65.2.30 if_em.c
--- if_em.c	7 Dec 2007 04:01:16 -0000	1.65.2.30
+++ if_em.c	17 Jan 2008 21:49:42 -0000
@@ -229,7 +229,9 @@
 static void	em_identify_hardware(struct adapter *);
 static int	em_allocate_pci_resources(struct adapter *);
 static int	em_allocate_intr(struct adapter *);
+#if __FreeBSD_version > 602111  /* MSI support is present */
 static bool	em_setup_msix(struct adapter *);
+#endif
 static void	em_free_intr(struct adapter *);
 static void	em_free_pci_resources(struct adapter *);
 static void	em_local_timer(void *);


>Release-Note:
>Audit-Trail:
>Unformatted: