svn commit: r320973 - in head/sys: conf modules/ixl

[Bryan Drewery]

Author: bdrewery
Date: Thu Jul 13 22:45:23 2017
New Revision: 320973
URL: https://svnweb.freebsd.org/changeset/base/320973

Log:
  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

Modified:
  head/sys/conf/files.amd64
  head/sys/modules/ixl/Makefile

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Thu Jul 13 22:12:41 2017	(r320972)
+++ head/sys/conf/files.amd64	Thu Jul 13 22:45:23 2017	(r320973)
@@ -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"

Modified: head/sys/modules/ixl/Makefile
==============================================================================
--- head/sys/modules/ixl/Makefile	Thu Jul 13 22:12:41 2017	(r320972)
+++ head/sys/modules/ixl/Makefile	Thu Jul 13 22:45:23 2017	(r320973)
@@ -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