From dc80a6153f0eb9d59394aee2977d8aa300a21bb4 Mon Sep 17 00:00:00 2001 From: Ivan Vecera Date: Mon, 1 Oct 2012 01:56:55 +0000 Subject: [PATCH] --- yaml --- r: 328401 b: refs/heads/master c: 2f6a02604e962295569749913081365ec9ec1372 h: refs/heads/master i: 328399: e97525419cfacbdb85fc58aa3a72358c53946f2e v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/emulex/benet/be_main.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a72480eca4f7..8b0a61161c3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4b549a5ac818722fc13d789584f41f4e00d78b5 +refs/heads/master: 2f6a02604e962295569749913081365ec9ec1372 diff --git a/trunk/drivers/net/ethernet/emulex/benet/be_main.c b/trunk/drivers/net/ethernet/emulex/benet/be_main.c index 6accb0c0273a..8dd42b309f38 100644 --- a/trunk/drivers/net/ethernet/emulex/benet/be_main.c +++ b/trunk/drivers/net/ethernet/emulex/benet/be_main.c @@ -1075,7 +1075,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); @@ -1086,9 +1086,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 && pci_physfn(dev) == pdev) { vfs++; if (dev->dev_flags & PCI_DEV_FLAGS_ASSIGNED) assigned_vfs++;