diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2010-09-28 07:11:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-28 07:11:51 +0200 |
| commit | 2ddaad397c47de012dfb956b0c05540da1a0dde5 (patch) | |
| tree | 1ea16a2a066c83b486fe5e0ba047ef7b70aa0312 /drivers/net/tg3.c | |
| parent | 8021q: Use netif_copy_real_num_queues() to set queue counts (diff) | |
| download | linux-2ddaad397c47de012dfb956b0c05540da1a0dde5.tar.xz linux-2ddaad397c47de012dfb956b0c05540da1a0dde5.zip | |
tg3: Use netif_set_real_num_{rx,tx}_queues()
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/tg3.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index fdb438dca9b3..54fff5bb6f98 100644 --- a/drivers/net/tg3.c +++ b/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 @@ defcfg: 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); } } |