diff options
| author | Sathya Perla <sathya.perla@emulex.com> | 2011-10-24 02:45:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-24 18:40:14 -0400 |
| commit | dafc0fe3afa565c88e44f1c243a49ce209f78ba7 (patch) | |
| tree | 60b9819811ea30fe3dea7907dd20687ca3ed15a8 /drivers/net | |
| parent | f9449ab76805a2f0e739f5e85a6d9e32d089f1b2 (diff) | |
| download | linux-stable-dafc0fe3afa565c88e44f1c243a49ce209f78ba7.tar.gz linux-stable-dafc0fe3afa565c88e44f1c243a49ce209f78ba7.tar.bz2 linux-stable-dafc0fe3afa565c88e44f1c243a49ce209f78ba7.zip | |
be2net: don't create multiple TXQs in BE2
Multiple TXQ support is partially broken in BE2. It is fully
supported BE3 onwards and in Lancer.
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 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index d32e3787beb4..555b0ec3fe5f 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -1633,6 +1633,17 @@ static void be_tx_queues_destroy(struct be_adapter *adapter) be_queue_free(adapter, q); } +static int be_num_txqs_want(struct be_adapter *adapter) +{ + if ((num_vfs && adapter->sriov_enabled) || + (adapter->function_mode & 0x400) || + lancer_chip(adapter) || !be_physfn(adapter) || + adapter->generation == BE_GEN2) + return 1; + else + return MAX_TX_QS; +} + /* One TX event queue is shared by all TX compl qs */ static int be_tx_queues_create(struct be_adapter *adapter) { @@ -1640,6 +1651,11 @@ static int be_tx_queues_create(struct be_adapter *adapter) struct be_tx_obj *txo; u8 i; + adapter->num_tx_qs = be_num_txqs_want(adapter); + if (adapter->num_tx_qs != MAX_TX_QS) + netif_set_real_num_tx_queues(adapter->netdev, + adapter->num_tx_qs); + adapter->tx_eq.max_eqd = 0; adapter->tx_eq.min_eqd = 0; adapter->tx_eq.cur_eqd = 96; @@ -3180,16 +3196,6 @@ static int be_get_config(struct be_adapter *adapter) if (status) return status; - if ((num_vfs && adapter->sriov_enabled) || - (adapter->function_mode & 0x400) || - lancer_chip(adapter) || !be_physfn(adapter)) { - adapter->num_tx_qs = 1; - netif_set_real_num_tx_queues(adapter->netdev, - adapter->num_tx_qs); - } else { - adapter->num_tx_qs = MAX_TX_QS; - } - return 0; } |