tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Revert "be2net: fix vfs enumeration"

This reverts commit 51af6d7c1f31e0f3d42c87d53657ec7acb6e3462.

Breaks the build with CONFIG_PCI_ATS not enabled.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller d9f72f35 404f7c9e

+4 -2
+4 -2
drivers/net/ethernet/emulex/benet/be_main.c
··· 1076 1076 static int be_find_vfs(struct be_adapter *adapter, int vf_state) 1077 1077 { 1078 1078 struct pci_dev *dev, *pdev = adapter->pdev; 1079 - int vfs = 0, assigned_vfs = 0, pos; 1079 + int vfs = 0, assigned_vfs = 0, pos, vf_fn; 1080 1080 u16 offset, stride; 1081 1081 1082 1082 pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV); ··· 1087 1087 1088 1088 dev = pci_get_device(pdev->vendor, PCI_ANY_ID, NULL); 1089 1089 while (dev) { 1090 - if (dev->is_virtfn && dev->physfn == pdev) { 1090 + vf_fn = (pdev->devfn + offset + stride * vfs) & 0xFFFF; 1091 + if (dev->is_virtfn && dev->devfn == vf_fn && 1092 + dev->bus->number == pdev->bus->number) { 1091 1093 vfs++; 1092 1094 if (dev->dev_flags & PCI_DEV_FLAGS_ASSIGNED) 1093 1095 assigned_vfs++;