diff options
author | Ivan Vecera <ivecera@redhat.com> | 2012-09-25 02:50:42 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-27 18:14:15 -0400 |
commit | 51af6d7c1f31e0f3d42c87d53657ec7acb6e3462 (patch) | |
tree | a143827ed140890d0bfa8a4fbe0b7217640bf6d2 /drivers/net/ethernet/emulex | |
parent | eccc1bb8d4b4cf68d3c9becb083fa94ada7d495c (diff) | |
download | linux-stable-51af6d7c1f31e0f3d42c87d53657ec7acb6e3462.tar.gz linux-stable-51af6d7c1f31e0f3d42c87d53657ec7acb6e3462.tar.bz2 linux-stable-51af6d7c1f31e0f3d42c87d53657ec7acb6e3462.zip |
be2net: fix vfs enumeration
Current VFs enumeration algorithm used in be_find_vfs does not take domain
number into the match. The match found in igb/ixgbe is more elegant and
safe.
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex')
-rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 84379f4fe837..966d9afb652f 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -1076,7 +1076,7 @@ static int be_set_vf_tx_rate(struct net_device *netdev, static int be_find_vfs(struct be_adapter *adapter, int vf_state) { struct pci_dev *dev, *pdev = adapter->pdev; - int vfs = 0, assigned_vfs = 0, pos, vf_fn; + int vfs = 0, assigned_vfs = 0, pos; u16 offset, stride; pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV); @@ -1087,9 +1087,7 @@ static int be_find_vfs(struct be_adapter *adapter, int vf_state) dev = pci_get_device(pdev->vendor, PCI_ANY_ID, NULL); while (dev) { - vf_fn = (pdev->devfn + offset + stride * vfs) & 0xFFFF; - if (dev->is_virtfn && dev->devfn == vf_fn && - dev->bus->number == pdev->bus->number) { + if (dev->is_virtfn && dev->physfn == pdev) { vfs++; if (dev->dev_flags & PCI_DEV_FLAGS_ASSIGNED) assigned_vfs++; |