From 0b5dfac59bd46024751aa64cfe01ac41789b8a52 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 27 Sep 2010 22:11:51 -0700 Subject: [PATCH] --- yaml --- r: 214794 b: refs/heads/master c: 2ddaad397c47de012dfb956b0c05540da1a0dde5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fde598e0af3c..a65d2857f0de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5df8dbd7e517b581e0b8cbd72a99da17914a20b0 +refs/heads/master: 2ddaad397c47de012dfb956b0c05540da1a0dde5 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index fdb438dca9b3..54fff5bb6f98 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -8821,7 +8821,12 @@ static bool tg3_enable_msix(struct tg3 *tp) for (i = 0; i < tp->irq_max; i++) tp->napi[i].irq_vec = msix_ent[i].vector; - tp->dev->real_num_tx_queues = 1; + netif_set_real_num_tx_queues(tp->dev, 1); + rc = tp->irq_cnt > 1 ? tp->irq_cnt - 1 : 1; + if (netif_set_real_num_rx_queues(tp->dev, rc)) { + pci_disable_msix(tp->pdev); + return false; + } if (tp->irq_cnt > 1) tp->tg3_flags3 |= TG3_FLG3_ENABLE_RSS; @@ -8856,7 +8861,7 @@ static void tg3_ints_init(struct tg3 *tp) if (!(tp->tg3_flags2 & TG3_FLG2_USING_MSIX)) { tp->irq_cnt = 1; tp->napi[0].irq_vec = tp->pdev->irq; - tp->dev->real_num_tx_queues = 1; + netif_set_real_num_tx_queues(tp->dev, 1); } }