diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2010-09-27 08:25:16 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-27 22:09:50 -0700 |
| commit | 657d92fe6d693b9674264bc7546e664714955425 (patch) | |
| tree | 4842bdb3f8f504d0f7b3b37d3da6fce12207d9e3 /drivers/net/bnx2.c | |
| parent | 3171d026291d08c2a4cfe06302ce308b09605c4b (diff) | |
| download | kernel-common-657d92fe6d693b9674264bc7546e664714955425.tar.gz kernel-common-657d92fe6d693b9674264bc7546e664714955425.tar.bz2 kernel-common-657d92fe6d693b9674264bc7546e664714955425.zip | |
bnx2: 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 'drivers/net/bnx2.c')
| -rw-r--r-- | drivers/net/bnx2.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 3d1a5da98622..b10be27f340a 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -6202,7 +6202,7 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs) } } -static void +static int bnx2_setup_int_mode(struct bnx2 *bp, int dis_msi) { int cpus = num_online_cpus(); @@ -6231,9 +6231,10 @@ bnx2_setup_int_mode(struct bnx2 *bp, int dis_msi) } bp->num_tx_rings = rounddown_pow_of_two(bp->irq_nvecs); - bp->dev->real_num_tx_queues = bp->num_tx_rings; + netif_set_real_num_tx_queues(bp->dev, bp->num_tx_rings); bp->num_rx_rings = bp->irq_nvecs; + return netif_set_real_num_rx_queues(bp->dev, bp->num_rx_rings); } /* Called with rtnl_lock */ @@ -6248,7 +6249,9 @@ bnx2_open(struct net_device *dev) bnx2_set_power_state(bp, PCI_D0); bnx2_disable_int(bp); - bnx2_setup_int_mode(bp, disable_msi); + rc = bnx2_setup_int_mode(bp, disable_msi); + if (rc) + goto open_err; bnx2_init_napi(bp); bnx2_napi_enable(bp); rc = bnx2_alloc_mem(bp); |