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

[Xin Li]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On 06/01/15 12:15, Ryan Stone wrote:
> 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

I think modules/ixv also needs to be updated?

In 283670 John have also renamed the [un]init_iov functions to
iov_[un]init, to match the names.  I think ixgbe should follow that as
well.

Cheers,
- -- 
Xin LI <delphij at delphij.net>    https://www.delphij.net/
FreeBSD - The Power to Serve!           Live free or die
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1.4 (FreeBSD)

iQIcBAEBCgAGBQJVbLLlAAoJEJW2GBstM+nsYH8QAIfxz9MfJ3xGorc/5lZhCyQb
ZvVV3kdI5Cg6cysUeyQBW2okFQ2BbfHuy+B1IlM7rNoFAbtx0nVpA7Ef12WhJEfQ
0eKt+MjkMgGxopVNy4RtUnH79MtljDcPPJZsFsMOwvqpLQD/0vSGPEAPBgToWEfp
PQ2E4aznzb6ilj8KpQflO32R0dRJt0R9XTq7mVnkfaPtb3e85F3ACEPj0U3+Xpor
8qwjk9ji/vAR2TLziruZKOCm66jwusjpCM0Mr0tqwpv4KlsJh5fB1zCkBGtYMIkK
yDm7glkgM0wBUS2ThPUXEbzn5vJ2Q5eB5m2EjFcNpMnjGPinClDzFOHfvrZRNhDN
ZddqnpKIf1HJSD6O7Q0+MfaDxfS0UQV678OP+5maMXLdbD8Kox+Z3vazG4W4TQGC
wbvp7NNgi/c/f1sE5CKRg3VIJGK3rq7DHZqnz9S2u9OdkGpIGscwzrVM29ebEXOA
7uMeyjTaB3eCObBa2Sdea8wcJzsT7OyS984aiLRxBcKSzS4l3sLI+14a6Fn4Snpr
ppf0DKUg8rc3ywMJ2utAyf6vu3S57uIetJRH8IqzIvGszs55h32RwWfsFX5FeC9c
FNW83PjgMrmlM2I73gkGWAYFWbs/ziuBLmLr4qVNRVdli5rmkIZaRBNfdT8HSneY
q26lHAasDzROf+9W42R/
=MwRo
-----END PGP SIGNATURE-----