43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 4df5eb92325bde926fc45d8609a1cac6ceef6bc5 Mon Sep 17 00:00:00 2001
|
|
From: Sathya Perla <sathya.perla@emulex.com>
|
|
Date: Tue, 5 Jun 2012 19:37:20 +0000
|
|
Subject: [PATCH 02/13] be2net: fix reporting number of actual rx queues
|
|
|
|
commit 7f6400626631454f5b535eb92c09a35390777a52 upstream.
|
|
|
|
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/emulex/benet/be_main.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
|
|
index 2cf02d6..4e1305f 100644
|
|
--- a/drivers/net/ethernet/emulex/benet/be_main.c
|
|
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
|
|
@@ -1890,6 +1890,12 @@ static int be_rx_cqs_create(struct be_adapter *adapter)
|
|
*/
|
|
adapter->num_rx_qs = (num_irqs(adapter) > 1) ?
|
|
num_irqs(adapter) + 1 : 1;
|
|
+ if (adapter->num_rx_qs != MAX_RX_QS) {
|
|
+ rtnl_lock();
|
|
+ netif_set_real_num_rx_queues(adapter->netdev,
|
|
+ adapter->num_rx_qs);
|
|
+ rtnl_unlock();
|
|
+ }
|
|
|
|
adapter->big_page_size = (1 << get_order(rx_frag_size)) * PAGE_SIZE;
|
|
for_all_rx_queues(adapter, rxo, i) {
|
|
@@ -3640,7 +3646,7 @@ static int __devinit be_probe(struct pci_dev *pdev,
|
|
goto disable_dev;
|
|
pci_set_master(pdev);
|
|
|
|
- netdev = alloc_etherdev_mq(sizeof(struct be_adapter), MAX_TX_QS);
|
|
+ netdev = alloc_etherdev_mqs(sizeof(*adapter), MAX_TX_QS, MAX_RX_QS);
|
|
if (netdev == NULL) {
|
|
status = -ENOMEM;
|
|
goto rel_reg;
|
|
--
|
|
1.7.10.4
|
|
|