aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-09-27 08:25:27 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-27 22:09:51 -0700
commit31b600b5fcd101acffb261f87f60f27085ca6509 (patch)
treea7d7f11496f07f2fd8aa6f5996ba94abc4a71864 /drivers/net/bnx2x
parentbnx2: Use netif_set_real_num_{rx,tx}_queues() (diff)
downloadlinux-dev-31b600b5fcd101acffb261f87f60f27085ca6509.tar.xz
linux-dev-31b600b5fcd101acffb261f87f60f27085ca6509.zip
bnx2x: 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/bnx2x')
-rw-r--r--drivers/net/bnx2x/bnx2x_cmn.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
index efc7be4aefb5..05c05a496b15 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@ -1207,8 +1207,8 @@ static int bnx2x_set_num_queues(struct bnx2x *bp)
bp->num_queues = 1;
break;
}
- bp->dev->real_num_tx_queues = bp->num_queues;
- return rc;
+ netif_set_real_num_tx_queues(bp->dev, bp->num_queues);
+ return netif_set_real_num_rx_queues(bp->dev, bp->num_queues);
}
static void bnx2x_release_firmware(struct bnx2x *bp)
@@ -1240,6 +1240,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
bp->state = BNX2X_STATE_OPENING_WAIT4_LOAD;
rc = bnx2x_set_num_queues(bp);
+ if (rc)
+ return rc;
if (bnx2x_alloc_mem(bp)) {
bnx2x_free_irq(bp, true);