Date: Mon, 1 Jun 2015 15:15:44 -0400 From: Ryan Stone <rysto32@gmail.com> To: Glen Barber <gjb@freebsd.org> Cc: Jack F Vogel <jfv@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r283883 - in head/sys: dev/ixgbe modules/ixv Message-ID: <CAFMmRNw5z=Lvk4U6R5Z5u_g4O1aOcEQvdytgJcoGwnvtcXwvGg@mail.gmail.com> In-Reply-To: <20150601184226.GC53056@hub.FreeBSD.org> References: <201506011743.t51HhZUP011379@svn.freebsd.org> <20150601184226.GC53056@hub.FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFMmRNw5z=Lvk4U6R5Z5u_g4O1aOcEQvdytgJcoGwnvtcXwvGg>