From patchwork Sun Jul 22 19:37:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 172527 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 769442C011B for ; Mon, 23 Jul 2012 05:37:38 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752521Ab2GVThf (ORCPT ); Sun, 22 Jul 2012 15:37:35 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:38143 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752430Ab2GVThe (ORCPT ); Sun, 22 Jul 2012 15:37:34 -0400 Received: from localhost (74-93-104-98-Washington.hfc.comcastbusiness.net [74.93.104.98]) by shards.monkeyblade.net (Postfix) with ESMTPSA id 3D5B6583B3A; Sun, 22 Jul 2012 12:37:36 -0700 (PDT) Date: Sun, 22 Jul 2012 12:37:33 -0700 (PDT) Message-Id: <20120722.123733.1898891964192153293.davem@davemloft.net> To: jeffrey.t.kirsher@intel.com Cc: netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com Subject: Re: [net-next 00/13][pull request] Intel Wired LAN Driver Updates From: David Miller In-Reply-To: <20120722.122405.1220712908232591030.davem@davemloft.net> References: <1342912142-11130-1-git-send-email-jeffrey.t.kirsher@intel.com> <20120722.122405.1220712908232591030.davem@davemloft.net> X-Mailer: Mew version 6.5 on Emacs 24.0.97 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Miller Date: Sun, 22 Jul 2012 12:24:05 -0700 (PDT) > From: Jeff Kirsher > Date: Sat, 21 Jul 2012 16:08:49 -0700 > >> This series contains updates to ixgbe and ixgbevf. >> >> The following are changes since commit 186e868786f97c8026f0a81400b451ace306b3a4: >> forcedeth: spin_unlock_irq in interrupt handler fix >> and are available in the git repository at: >> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master > > Pulled, thanks Jeff. Can you guys actually build test this stuff? ==================== [PATCH] ixgbe: Fix build with PCI_IOV enabled. Signed-off-by: David S. Miller --- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c index 47b2ce7..4fea871 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c @@ -236,7 +236,7 @@ void ixgbe_disable_sriov(struct ixgbe_adapter *adapter) if (ixgbe_vfs_are_assigned(adapter)) { e_dev_warn("Unloading driver while VFs are assigned - VFs will not be deallocated\n"); return; - + } /* disable iov and allow time for transactions to clear */ pci_disable_sriov(adapter->pdev); #endif