diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-09-27 04:25:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-28 01:09:51 -0400 |
commit | 31b600b5fcd101acffb261f87f60f27085ca6509 (patch) | |
tree | a7d7f11496f07f2fd8aa6f5996ba94abc4a71864 /drivers/net/bnx2x/bnx2x_cmn.c | |
parent | 657d92fe6d693b9674264bc7546e664714955425 (diff) |
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/bnx2x_cmn.c')
-rw-r--r-- | drivers/net/bnx2x/bnx2x_cmn.c | 6 |
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) | |||
1207 | bp->num_queues = 1; | 1207 | bp->num_queues = 1; |
1208 | break; | 1208 | break; |
1209 | } | 1209 | } |
1210 | bp->dev->real_num_tx_queues = bp->num_queues; | 1210 | netif_set_real_num_tx_queues(bp->dev, bp->num_queues); |
1211 | return rc; | 1211 | return netif_set_real_num_rx_queues(bp->dev, bp->num_queues); |
1212 | } | 1212 | } |
1213 | 1213 | ||
1214 | static void bnx2x_release_firmware(struct bnx2x *bp) | 1214 | static void bnx2x_release_firmware(struct bnx2x *bp) |
@@ -1240,6 +1240,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode) | |||
1240 | bp->state = BNX2X_STATE_OPENING_WAIT4_LOAD; | 1240 | bp->state = BNX2X_STATE_OPENING_WAIT4_LOAD; |
1241 | 1241 | ||
1242 | rc = bnx2x_set_num_queues(bp); | 1242 | rc = bnx2x_set_num_queues(bp); |
1243 | if (rc) | ||
1244 | return rc; | ||
1243 | 1245 | ||
1244 | if (bnx2x_alloc_mem(bp)) { | 1246 | if (bnx2x_alloc_mem(bp)) { |
1245 | bnx2x_free_irq(bp, true); | 1247 | bnx2x_free_irq(bp, true); |