aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxiong <xiong@qca.qualcomm.com>2013-01-19 13:15:07 +0800
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-01-24 07:56:06 -0800
commit12d43485c70375f0f83f480821506a40f7531375 (patch)
tree77784866970090d9127998fa6cef8c754a94da7f
parentf6a28405f4366240ab04dca308a1f23b2c313551 (diff)
downloadalx-12d43485c70375f0f83f480821506a40f7531375.tar.gz
alx: reduce num txq to 1 if MSIX disabled
ONLY 1 napi is allocated for MSI & INTx mode interrupt, so, only 1 txq/rxq is supported. Signed-off-by: xiong <xiong@qca.qualcomm.com> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rw-r--r--src/alx_ethtool.c4
-rw-r--r--src/alx_main.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/alx_ethtool.c b/src/alx_ethtool.c
index bc94f8f..50cae4a 100644
--- a/src/alx_ethtool.c
+++ b/src/alx_ethtool.c
@@ -1284,8 +1284,8 @@ static int alx_diag_rx_pkt(struct alx_adapter *adpt, int rx_qidx,
qnum = FIELD_GETX(rrd->word2, RRD_RSSQ) % adpt->nr_rxq;
if (rx_qidx != qnum) {
netif_err(adpt, rx_err, adpt->netdev,
- "rx Q-number is wrong (%d:%d), w2=%X\n",
- rx_qidx, qnum, rrd->word2);
+ "rx Q-number is wrong (%d:%d), hash=%X,w2=%X\n",
+ rx_qidx, qnum, rrd->rss_hash, rrd->word2);
return -4;
}
diff --git a/src/alx_main.c b/src/alx_main.c
index f3762d9..eb7faf3 100644
--- a/src/alx_main.c
+++ b/src/alx_main.c
@@ -1293,7 +1293,7 @@ void alx_init_intr(struct alx_adapter *adpt)
ALX_FLAG_SET(adpt, USING_MSIX);
}
if (!ALX_FLAG(adpt, USING_MSIX)) {
- adpt->nr_txq = ALX_CAP(hw, MTQ) ? ALX_MAX_TX_QUEUES : 1;
+ adpt->nr_txq = 1;
adpt->nr_rxq = 1;
adpt->nr_napi = 1;
adpt->nr_vec = 1;