From owner-freebsd-bugs@FreeBSD.ORG Fri Jan 18 06:20:02 2008 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F358816A417 for ; Fri, 18 Jan 2008 06:20:01 +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 AE8AA13C46E for ; Fri, 18 Jan 2008 06:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m0I6K1Dn065774 for ; Fri, 18 Jan 2008 06:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m0I6K1lr065773; Fri, 18 Jan 2008 06:20:01 GMT (envelope-from gnats) Resent-Date: Fri, 18 Jan 2008 06:20:01 GMT Resent-Message-Id: <200801180620.m0I6K1lr065773@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, David Yeske Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3ED3F16A418 for ; Fri, 18 Jan 2008 06:11:29 +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 09C5E13C43E for ; Fri, 18 Jan 2008 06:11:29 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m0I6A6e6067029 for ; Fri, 18 Jan 2008 06:10:06 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m0I6A6nv067028; Fri, 18 Jan 2008 06:10:06 GMT (envelope-from nobody) Message-Id: <200801180610.m0I6A6nv067028@www.freebsd.org> Date: Fri, 18 Jan 2008 06:10:06 GMT From: David Yeske To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: kern/119767: if_em fix for systems without msix support X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2008 06:20:02 -0000 >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@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: