From: Somnath Kotur <somnath.kotur@emulex.com>
Date: Sun, 24 Jun 2012 19:42:00 +0000 (+0000)
Subject: be2net: Regression bug wherein VFs creation broken for multiple cards.
X-Git-Tag: firefly_0821_release~3680^2~2381^2~449
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7665de15642dfb1709177517aa0488162727342c;p=firefly-linux-kernel-4.4.55.git

be2net: Regression bug wherein VFs creation broken for multiple cards.

Fix be_find_vfs() to check for matching bus number as well along with devfn

Signed-off-by: Somnath Kotur <somnath.kotur@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index c60782e299db..a28896d4411d 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1059,7 +1059,8 @@ 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) {
+		if (dev->is_virtfn && dev->devfn == vf_fn &&
+			dev->bus->number == pdev->bus->number) {
 			vfs++;
 			if (dev->dev_flags & PCI_DEV_FLAGS_ASSIGNED)
 				assigned_vfs++;