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: v2.6.39-400.9.0~373
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c887804024cd6e7d66683f4d32b20c59298b11a7;p=users%2Fjedix%2Flinux-maple.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/benet/be_main.c b/drivers/net/benet/be_main.c
index 2890c971d0e9..d642d75225bf 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -1033,7 +1033,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++;