aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2017-07-13 22:45:23 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2017-07-13 22:45:23 +0000
commita19f95b3595424bfdf87e3b446a4a5332c237f8e (patch)
tree1039cc9d087aa40798d6637921cfaeca7a684778 /sys
parent3820007146e10e46357c0e688413ef95bf4e808f (diff)
downloadsrc-a19f95b3595424bfdf87e3b446a4a5332c237f8e.tar.gz
src-a19f95b3595424bfdf87e3b446a4a5332c237f8e.zip
Fix kldload of if_ixl without PCI_IOV kernel option.
This also avoids compiling in pci_iov support into the kernel if_ixoif the PCI_IOV option is disabled. Reviewed by: rstone Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D11573
Notes
Notes: svn path=/head/; revision=320973
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files.amd642
-rw-r--r--sys/modules/ixl/Makefile5
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 13f2ae822c2d..72afbfa889c0 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -253,7 +253,7 @@ dev/ixl/ixl_pf_main.c optional ixl pci \
compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/ixl_pf_qmgr.c optional ixl pci \
compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixl_pf_iov.c optional ixl pci \
+dev/ixl/ixl_pf_iov.c optional ixl pci pci_iov \
compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/ixl_pf_i2c.c optional ixl pci \
compile-with "${NORMAL_C} -I$S/dev/ixl"
diff --git a/sys/modules/ixl/Makefile b/sys/modules/ixl/Makefile
index daacaec56a5a..a5d6f50dbed7 100644
--- a/sys/modules/ixl/Makefile
+++ b/sys/modules/ixl/Makefile
@@ -3,10 +3,11 @@
.PATH: ${SRCTOP}/sys/dev/ixl
KMOD = if_ixl
-SRCS = device_if.h bus_if.h pci_if.h pci_iov_if.h
+SRCS = device_if.h bus_if.h pci_if.h
SRCS += opt_inet.h opt_inet6.h opt_rss.h opt_ixl.h
SRCS += if_ixl.c ixl_pf_main.c ixl_pf_qmgr.c ixl_txrx.c ixl_pf_i2c.c i40e_osdep.c
-SRCS += ixl_pf_iov.c ixl_iw.c
+SRCS += ixl_iw.c
+SRCS.PCI_IOV= pci_iov_if.h ixl_pf_iov.c
# Shared source
SRCS += i40e_common.c i40e_nvm.c i40e_adminq.c i40e_lan_hmc.c i40e_hmc.c