svn commit: r283883 - in head/sys: dev/ixgbe modules/ixv

[Ryan Stone]

I think that this is a conflict with r283670, which changed the interface
for SR-IOV a little bit.

Sorry Jack, I knew that that change was coming but it didn't occur to me
that the ixgbe patch would have to be updated.  I believe that this patch
will fix it:

diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c
index 0c3769c..ae822f2 100644
--- a/sys/dev/ixgbe/if_ix.c
+++ b/sys/dev/ixgbe/if_ix.c
@@ -46,6 +46,10 @@
 #include <netinet/in_rss.h>
 #endif

+#ifdef PCI_IOV
+#include <dev/pci/pci_iov.h>
+#endif
+
 /*********************************************************************
  *  Set this to one to display debug statistics
  *********************************************************************/
@@ -230,9 +234,9 @@ static device_method_t ix_methods[] = {
        DEVMETHOD(device_suspend, ixgbe_suspend),
        DEVMETHOD(device_resume, ixgbe_resume),
 #ifdef PCI_IOV
-       DEVMETHOD(pci_init_iov, ixgbe_init_iov),
-       DEVMETHOD(pci_uninit_iov, ixgbe_uninit_iov),
-       DEVMETHOD(pci_add_vf, ixgbe_add_vf),
+       DEVMETHOD(pci_iov_init, ixgbe_init_iov),
+       DEVMETHOD(pci_iov_uninit, ixgbe_uninit_iov),
+       DEVMETHOD(pci_iov_add_vf, ixgbe_add_vf),
 #endif /* PCI_IOV */
        DEVMETHOD_END
 };
diff --git a/sys/modules/ix/Makefile b/sys/modules/ix/Makefile
index 1f30cb0..8846f2d 100644
--- a/sys/modules/ix/Makefile
+++ b/sys/modules/ix/Makefile
@@ -3,7 +3,7 @@
 .PATH:  ${.CURDIR}/../../dev/ixgbe

 KMOD    = if_ix
-SRCS    = device_if.h bus_if.h pci_if.h
+SRCS    = device_if.h bus_if.h pci_if.h pci_iov_if.h
 SRCS   += opt_inet.h opt_inet6.h opt_rss.h
 SRCS    += if_ix.c ix_txrx.c
 # Shared source