From owner-svn-src-head@FreeBSD.ORG Mon Jun 1 19:15:45 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 B813B2CD; Mon, 1 Jun 2015 19:15:45 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mail-ig0-x236.google.com (mail-ig0-x236.google.com [IPv6:2607:f8b0:4001:c05::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 80A421D7E; Mon, 1 Jun 2015 19:15:45 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by igbjd9 with SMTP id jd9so69542884igb.1; Mon, 01 Jun 2015 12:15:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=Q+cfCjD4dLFX+vOobzdvDq9cdy3srMsiEj4jtQ+QGz0=; b=t6zqA0VE3sGB62j3uj+oo/kn1q80Ym3gfbBBnirOlPtklBflcRF24KjoSVofI03vqC 9ArgQzyDaj/BsnzQ1iVHj4sdcC83Z813qCkuJTj8aiQ9QPzVz21jfkImuXVIcwZOvd+o +iB5/DmZ8mrSL3hrEjLLCWG0kcbPob8T9uTaZsLWPLTEYhJbGglDWzXis+8FPQ5AAs7Y /bT8odOA66QBQlvmGqWjjZyuuZtvhW+2MjHWp68RbAiok3uYsR06cI+adgYY/pXB/2C5 8FayyOy3z9LhYWntN+c4N+bCgM9iPEZzZ4et/tUOiyOCbsZAUM7u//EQa5FkZZl7QRDl ON3w== MIME-Version: 1.0 X-Received: by 10.50.47.50 with SMTP id a18mr8375921ign.46.1433186144834; Mon, 01 Jun 2015 12:15:44 -0700 (PDT) Received: by 10.107.40.194 with HTTP; Mon, 1 Jun 2015 12:15:44 -0700 (PDT) In-Reply-To: <20150601184226.GC53056@hub.FreeBSD.org> References: <201506011743.t51HhZUP011379@svn.freebsd.org> <20150601184226.GC53056@hub.FreeBSD.org> Date: Mon, 1 Jun 2015 15:15:44 -0400 Message-ID: Subject: Re: svn commit: r283883 - in head/sys: dev/ixgbe modules/ixv From: Ryan Stone To: Glen Barber Cc: Jack F Vogel , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 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:15:45 -0000 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