Commit d5e51a10 authored Mar 13, 2013 by Alex Williamson Committed by Jeff Kirsher Mar 26, 2013

igb: SR-IOV init reordering



igb is ineffective at setting a lower total VFs because:

int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs)
{
        ...
        /* Shouldn't change if VFs already enabled */
        if (dev->sriov->ctrl & PCI_SRIOV_CTRL_VFE)
                return -EBUSY;

Swap init ordering.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Greg Rose <gregory.v.rose@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent d0f63acc

drivers/net/ethernet/intel/igb/igb_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2542,8 +2542,8 @@ static void igb_probe_vfs(struct igb_adapter *adapter)
		if ((hw->mac.type == e1000_i210) \|\| (hw->mac.type == e1000_i211))
		return;

		igb_enable_sriov(pdev, max_vfs);
		pci_sriov_set_totalvfs(pdev, 7);
		igb_enable_sriov(pdev, max_vfs);

		#endif /* CONFIG_PCI_IOV */
		}