34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From c6edc77cb260e386ccc2d0270bf1dfd6159171a7 Mon Sep 17 00:00:00 2001
|
|
From: Somnath Kotur <somnath.kotur@emulex.com>
|
|
Date: Sun, 24 Jun 2012 19:42:00 +0000
|
|
Subject: [PATCH 07/13] be2net: Regression bug wherein VFs creation broken for
|
|
multiple cards.
|
|
|
|
commit 7665de15642dfb1709177517aa0488162727342c upstream.
|
|
|
|
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>
|
|
---
|
|
drivers/net/ethernet/emulex/benet/be_main.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
|
|
index 3041436..dc10904 100644
|
|
--- a/drivers/net/ethernet/emulex/benet/be_main.c
|
|
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
|
|
@@ -1058,7 +1058,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++;
|
|
--
|
|
1.7.10.4
|
|
|