Date: Mon, 15 Jul 2013 23:27:49 +0000 (UTC) From: Jack F Vogel <jfv@FreeBSD.org> 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 Message-ID: <201307152327.r6FNRn9F090155@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/param.h> 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 <sys/param.h> 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 <bsd.own.mk> + .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 <bsd.kmod.mk> 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 <bsd.own.mk> + .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 <bsd.kmod.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307152327.r6FNRn9F090155>