diff options
| author |   Vasundhara Volam <vasundhara.volam@emulex.com> | 2013-10-01 15:59:56 +0530 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-10-01 12:45:51 -0400 |
| commit | b905b5d4d93d0b88fcd1d3bcd76d238d9401bc31 (patch) | |
| tree | 471ab33c3dc2cfdf26d5a054713b506097205d7d /drivers/net/ethernet/emulex/benet/be_main.c | |
| parent | net: can: c_can_platform: Remove redundant of_match_ptr (diff) | |
| download | linux-dev-b905b5d4d93d0b88fcd1d3bcd76d238d9401bc31.tar.xz linux-dev-b905b5d4d93d0b88fcd1d3bcd76d238d9401bc31.zip | |
be2net: Call be_vf_setup() even when VFs are enbaled from previous load
Re-define the sriov_want() macro to check for number of VFs that need
to be enabled in the current load of the driver or the number of VFs that
still remain enabled from the previous load (attached VFs cannot be disabled.)
Signed-off-by: Vasundhara Volam <vasundhara.volam@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 100b528b9bd0..4cb2ac79bfe2 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -2948,12 +2948,12 @@ static void BEx_get_resources(struct be_adapter *adapter, struct pci_dev *pdev = adapter->pdev; bool use_sriov = false; - if (BE3_chip(adapter) && be_physfn(adapter)) { + if (BE3_chip(adapter) && sriov_want(adapter)) { int max_vfs; max_vfs = pci_sriov_get_totalvfs(pdev); res->max_vfs = max_vfs > 0 ? min(MAX_VFS, max_vfs) : 0; - use_sriov = res->max_vfs && num_vfs; + use_sriov = res->max_vfs; } if (be_physfn(adapter)) @@ -3242,7 +3242,7 @@ static int be_setup(struct be_adapter *adapter) be_cmd_set_flow_control(adapter, adapter->tx_fc, adapter->rx_fc); - if (be_physfn(adapter) && num_vfs) { + if (sriov_want(adapter)) { if (be_max_vfs(adapter)) be_vf_setup(adapter); else |