diff options
| author | Sathya Perla <sathya.perla@emulex.com> | 2012-08-28 20:37:40 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-30 13:27:05 -0400 |
| commit | 4cbdaf6d520b6bd9a1565525e5ad1967cb74e191 (patch) | |
| tree | 96c6376744a7520eb62fb1973ec573b66c7c4a6a /drivers/net/ethernet/emulex | |
| parent | 0739d643b8dda866d1011bcfd01008d29593be03 (diff) | |
| download | blackbird-op-linux-4cbdaf6d520b6bd9a1565525e5ad1967cb74e191.tar.gz blackbird-op-linux-4cbdaf6d520b6bd9a1565525e5ad1967cb74e191.zip | |
be2net: create RSS rings even in multi-channel configs
Changes from commit df505e were incorrectly over-written by commit 10ef9ab.
Fixing the same.
Change log of the original fix:
Currently RSS rings are not created in a multi-channel config.
RSS rings can be created on one (out of four) interfaces per port in a
multi-channel config. Doing this insulates the driver from a FW bug wherin
multi-channel config is wrongly reported even when not enabled. This also
helps performance in a multi-channel config, as one interface per port gets
RSS rings.
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 90a903d83d87..d86d25cc33cf 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -2176,8 +2176,7 @@ static uint be_num_rss_want(struct be_adapter *adapter) { u32 num = 0; if ((adapter->function_caps & BE_FUNCTION_CAPS_RSS) && - !sriov_want(adapter) && be_physfn(adapter) && - !be_is_mc(adapter)) { + !sriov_want(adapter) && be_physfn(adapter)) { num = (adapter->be3_native) ? BE3_MAX_RSS_QS : BE2_MAX_RSS_QS; num = min_t(u32, num, (u32)netif_get_num_default_rss_queues()); } |
