diff options
author | erj <erj@FreeBSD.org> | 2015-05-28 20:56:11 +0000 |
---|---|---|
committer | erj <erj@FreeBSD.org> | 2015-05-28 20:56:11 +0000 |
commit | 6e387585c41b90d61ea28bd5390c7ba976cdf7e5 (patch) | |
tree | 8759c2559f3d410c64f5e3d9cebfb024538decef /sys/modules | |
parent | 34675faa3be2f4da2fec779e1bc9d7333262df6e (diff) | |
download | FreeBSD-src-6e387585c41b90d61ea28bd5390c7ba976cdf7e5.zip FreeBSD-src-6e387585c41b90d61ea28bd5390c7ba976cdf7e5.tar.gz |
Fix build issue and incompatibilites introduced by r283620.
- Re-introduce "device ixgbe" option for kernel configs. This allows
users to continue using existing kernel configurations, while still
letting if_ix and if_ixv exist to allow ifconfig magic to work.
Though the amd64 GENERIC config has "device ix" and "device ixv" instead of
"device ixgbe".
This is achieved by making the if_ixgbe module a stub that depends
on if_ix and if_ixv.
- Replace if_baudrate assignment with if_initbaudrate() call.
Thanks to jhb@ for the stub module suggestion and pointing out the if_baudrate
error.
Approved by: jfv (mentor)
Diffstat (limited to 'sys/modules')
-rw-r--r-- | sys/modules/Makefile | 7 | ||||
-rw-r--r-- | sys/modules/ix/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/ixgbe/Makefile | 21 | ||||
-rw-r--r-- | sys/modules/ixv/Makefile | 2 |
4 files changed, 9 insertions, 23 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 80b44f7..1260ff1 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -171,9 +171,10 @@ SUBDIR= \ ${_iwifw} \ ${_iwn} \ ${_iwnfw} \ - ${_ixgb} \ ${_ix} \ ${_ixv} \ + ${_ixgb} \ + ${_ixgbe} \ ${_ixl} \ ${_ixlv} \ jme \ @@ -616,6 +617,8 @@ _iwn= iwn .if ${MK_SOURCELESS_UCODE} != "no" _iwnfw= iwnfw .endif +_ix= ix +_ixv= ixv _ixgb= ixgb _ixgbe= ixgbe _mly= mly @@ -722,6 +725,8 @@ _iwn= iwn .if ${MK_SOURCELESS_UCODE} != "no" _iwnfw= iwnfw .endif +_ix= ix +_ixv= ixv _ixgb= ixgb _ixgbe= ixgbe _ixl= ixl diff --git a/sys/modules/ix/Makefile b/sys/modules/ix/Makefile index 1f30cb0..4b57379 100644 --- a/sys/modules/ix/Makefile +++ b/sys/modules/ix/Makefile @@ -4,7 +4,7 @@ KMOD = if_ix SRCS = device_if.h bus_if.h pci_if.h -SRCS += opt_inet.h opt_inet6.h opt_rss.h +SRCS += opt_inet.h opt_inet6.h SRCS += if_ix.c ix_txrx.c # Shared source SRCS += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c diff --git a/sys/modules/ixgbe/Makefile b/sys/modules/ixgbe/Makefile index 22aadb5..3a0526b 100644 --- a/sys/modules/ixgbe/Makefile +++ b/sys/modules/ixgbe/Makefile @@ -1,29 +1,10 @@ #$FreeBSD$ -.include <bsd.own.mk> - .PATH: ${.CURDIR}/../../dev/ixgbe KMOD = if_ixgbe SRCS = device_if.h bus_if.h pci_if.h -SRCS += opt_inet.h opt_inet6.h -SRCS += ixgbe.c ixv.c -# Shared source -SRCS += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c -SRCS += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c -SRCS += ixgbe_82599.c ixgbe_82598.c ixgbe_x540.c +SRCS += ixgbe.c CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP -.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> diff --git a/sys/modules/ixv/Makefile b/sys/modules/ixv/Makefile index f8ce347..fd428a0 100644 --- a/sys/modules/ixv/Makefile +++ b/sys/modules/ixv/Makefile @@ -4,7 +4,7 @@ KMOD = if_ixv SRCS = device_if.h bus_if.h pci_if.h -SRCS += opt_inet.h opt_inet6.h opt_rss.h +SRCS += opt_inet.h opt_inet6.h SRCS += if_ixv.c ix_txrx.c # Shared source SRCS += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c |