From owner-svn-src-head@FreeBSD.ORG Mon Jun 1 19:30:46 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F27DAD9; Mon, 1 Jun 2015 19:30:46 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [IPv6:2001:470:1:117::25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "anubis.delphij.net", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 6FA7210A1; Mon, 1 Jun 2015 19:30:46 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from zeta.ixsystems.com (c-71-202-112-39.hsd1.ca.comcast.net [71.202.112.39]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by anubis.delphij.net (Postfix) with ESMTPSA id B5DD1441E; Mon, 1 Jun 2015 12:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphij.net; s=anubis; t=1433187046; x=1433201446; bh=KOU8IKbNZd2FjQfx4r3YZCqgH9itNrF8ri+mnT3VJec=; h=Date:From:Reply-To:To:CC:Subject:References:In-Reply-To; b=mKsQmZaJFsAVjqNuuZL0FVr5ui/3n5eJnwk/dXDgVNS2F1fi7PT9sR2Gdwn2BxUJx SxDSOOmputAPNCXffn7SVQ0GhqGceV6r7RXQ+M1jLsLhmEUv/AQpne6K+prvV79fkw pwWYilXhIZ6s0BHJJ6FtTz3l9e5phnm9ue/Xq3Sk= Message-ID: <556CB2E5.7070304@delphij.net> Date: Mon, 01 Jun 2015 12:30:45 -0700 From: Xin Li Reply-To: d@delphij.net Organization: The FreeBSD Project MIME-Version: 1.0 To: Ryan Stone , Glen Barber CC: Jack F Vogel , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r283883 - in head/sys: dev/ixgbe modules/ixv References: <201506011743.t51HhZUP011379@svn.freebsd.org> <20150601184226.GC53056@hub.FreeBSD.org> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2015 19:30:46 -0000 -----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 > #endif > > +#ifdef PCI_IOV +#include +#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 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-----