From owner-svn-src-all@FreeBSD.ORG Mon Jul 15 23:27:50 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id ACE62D57; Mon, 15 Jul 2013 23:27:50 +0000 (UTC) (envelope-from jfv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8EFA5122; Mon, 15 Jul 2013 23:27:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6FNRoYX090162; Mon, 15 Jul 2013 23:27:50 GMT (envelope-from jfv@svn.freebsd.org) Received: (from jfv@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6FNRn9F090155; Mon, 15 Jul 2013 23:27:49 GMT (envelope-from jfv@svn.freebsd.org) Message-Id: <201307152327.r6FNRn9F090155@svn.freebsd.org> From: Jack F Vogel Date: Mon, 15 Jul 2013 23:27:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r253374 - in stable/9/sys: dev/e1000 dev/ixgbe modules/em modules/igb X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jul 2013 23:27:50 -0000 Author: jfv Date: Mon Jul 15 23:27:48 2013 New Revision: 253374 URL: http://svnweb.freebsd.org/changeset/base/253374 Log: MFC: r253284, r253285, r253303: Correct the Intel network driver module builds. They were not defining INET or INET6, and in the case of ixgbe this will cause a panic in the TSO setup code, but in all cases the ioctl behavior is different, this change makes the module and static consistent. Approved by: re Modified: stable/9/sys/dev/e1000/if_em.c stable/9/sys/dev/e1000/if_igb.c stable/9/sys/dev/e1000/if_lem.c stable/9/sys/dev/ixgbe/ixgbe.c stable/9/sys/dev/ixgbe/ixv.c stable/9/sys/modules/em/Makefile stable/9/sys/modules/igb/Makefile Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/e1000/ (props changed) stable/9/sys/dev/ixgbe/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/dev/e1000/if_em.c ============================================================================== --- stable/9/sys/dev/e1000/if_em.c Mon Jul 15 23:12:42 2013 (r253373) +++ stable/9/sys/dev/e1000/if_em.c Mon Jul 15 23:27:48 2013 (r253374) @@ -32,10 +32,11 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifdef HAVE_KERNEL_OPTION_HEADERS -#include "opt_device_polling.h" #include "opt_inet.h" #include "opt_inet6.h" + +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" #endif #include Modified: stable/9/sys/dev/e1000/if_igb.c ============================================================================== --- stable/9/sys/dev/e1000/if_igb.c Mon Jul 15 23:12:42 2013 (r253373) +++ stable/9/sys/dev/e1000/if_igb.c Mon Jul 15 23:27:48 2013 (r253374) @@ -33,10 +33,11 @@ /*$FreeBSD$*/ -#ifdef HAVE_KERNEL_OPTION_HEADERS -#include "opt_device_polling.h" #include "opt_inet.h" #include "opt_inet6.h" + +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" #include "opt_altq.h" #endif Modified: stable/9/sys/dev/e1000/if_lem.c ============================================================================== --- stable/9/sys/dev/e1000/if_lem.c Mon Jul 15 23:12:42 2013 (r253373) +++ stable/9/sys/dev/e1000/if_lem.c Mon Jul 15 23:27:48 2013 (r253374) @@ -32,10 +32,11 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifdef HAVE_KERNEL_OPTION_HEADERS -#include "opt_device_polling.h" #include "opt_inet.h" #include "opt_inet6.h" + +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" #endif #include Modified: stable/9/sys/dev/ixgbe/ixgbe.c ============================================================================== --- stable/9/sys/dev/ixgbe/ixgbe.c Mon Jul 15 23:12:42 2013 (r253373) +++ stable/9/sys/dev/ixgbe/ixgbe.c Mon Jul 15 23:27:48 2013 (r253374) @@ -33,11 +33,8 @@ /*$FreeBSD$*/ -#ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_inet.h" #include "opt_inet6.h" -#endif - #include "ixgbe.h" /********************************************************************* Modified: stable/9/sys/dev/ixgbe/ixv.c ============================================================================== --- stable/9/sys/dev/ixgbe/ixv.c Mon Jul 15 23:12:42 2013 (r253373) +++ stable/9/sys/dev/ixgbe/ixv.c Mon Jul 15 23:27:48 2013 (r253374) @@ -32,11 +32,8 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_inet.h" #include "opt_inet6.h" -#endif - #include "ixv.h" /********************************************************************* Modified: stable/9/sys/modules/em/Makefile ============================================================================== --- stable/9/sys/modules/em/Makefile Mon Jul 15 23:12:42 2013 (r253373) +++ stable/9/sys/modules/em/Makefile Mon Jul 15 23:27:48 2013 (r253374) @@ -1,7 +1,10 @@ # $FreeBSD$ + +.include + .PATH: ${.CURDIR}/../../dev/e1000 KMOD = if_em -SRCS = device_if.h bus_if.h pci_if.h opt_inet.h +SRCS = device_if.h bus_if.h pci_if.h opt_inet.h opt_inet6.h SRCS += $(CORE_SRC) $(LEGACY_SRC) SRCS += $(COMMON_SHARED) $(LEGACY_SHARED) $(PCIE_SHARED) CORE_SRC = if_em.c e1000_osdep.c @@ -18,4 +21,16 @@ CFLAGS += -I${.CURDIR}/../../dev/e1000 # DEVICE_POLLING for a non-interrupt-driven method #CFLAGS += -DDEVICE_POLLING +.if !defined(KERNBUILDDIR) +.if ${MK_INET_SUPPORT} != "no" +opt_inet.h: + @echo "#define INET 1" > ${.TARGET} +.endif + +.if ${MK_INET6_SUPPORT} != "no" +opt_inet6.h: + @echo "#define INET6 1" > ${.TARGET} +.endif +.endif + .include Modified: stable/9/sys/modules/igb/Makefile ============================================================================== --- stable/9/sys/modules/igb/Makefile Mon Jul 15 23:12:42 2013 (r253373) +++ stable/9/sys/modules/igb/Makefile Mon Jul 15 23:27:48 2013 (r253374) @@ -1,7 +1,10 @@ #$FreeBSD$ + +.include + .PATH: ${.CURDIR}/../../dev/e1000 KMOD = if_igb -SRCS = device_if.h bus_if.h pci_if.h opt_inet.h +SRCS = device_if.h bus_if.h pci_if.h opt_inet.h opt_inet6.h SRCS += if_igb.c $(SHARED_SRCS) SHARED_SRCS = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c SHARED_SRCS += e1000_80003es2lan.c e1000_82542.c e1000_82541.c e1000_82543.c @@ -14,4 +17,16 @@ CFLAGS += -I${.CURDIR}/../../dev/e1000 - # not advisable since MSIX gives better results #CFLAGS += -DDEVICE_POLLING +.if !defined(KERNBUILDDIR) +.if ${MK_INET_SUPPORT} != "no" +opt_inet.h: + @echo "#define INET 1" > ${.TARGET} +.endif + +.if ${MK_INET6_SUPPORT} != "no" +opt_inet6.h: + @echo "#define INET6 1" > ${.TARGET} +.endif +.endif + .include