aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-09-27 04:30:34 -0400
committerDavid S. Miller <davem@davemloft.net>2010-09-28 01:09:55 -0400
commitc99202684f7a45c965cb13fa6bb647f2ce9d27fa (patch)
tree340cc0c59ec473ba542cb9bfe6e84297dccc703b /drivers
parent206d6b3270921fe4a207515beb1f7f7cd8aa3597 (diff)
myri10ge: 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')
-rw-r--r--drivers/net/myri10ge/myri10ge.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 4f3a3c0d6d0..3ad1a21ca8c 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -990,7 +990,7 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
990 * RX queues, so if we get an error, first retry using a 990 * RX queues, so if we get an error, first retry using a
991 * single TX queue before giving up */ 991 * single TX queue before giving up */
992 if (status != 0 && mgp->dev->real_num_tx_queues > 1) { 992 if (status != 0 && mgp->dev->real_num_tx_queues > 1) {
993 mgp->dev->real_num_tx_queues = 1; 993 netif_set_real_num_tx_queues(mgp->dev, 1);
994 cmd.data0 = mgp->num_slices; 994 cmd.data0 = mgp->num_slices;
995 cmd.data1 = MXGEFW_SLICE_INTR_MODE_ONE_PER_SLICE; 995 cmd.data1 = MXGEFW_SLICE_INTR_MODE_ONE_PER_SLICE;
996 status = myri10ge_send_cmd(mgp, 996 status = myri10ge_send_cmd(mgp,
@@ -3923,7 +3923,8 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3923 dev_err(&pdev->dev, "failed to alloc slice state\n"); 3923 dev_err(&pdev->dev, "failed to alloc slice state\n");
3924 goto abort_with_firmware; 3924 goto abort_with_firmware;
3925 } 3925 }
3926 netdev->real_num_tx_queues = mgp->num_slices; 3926 netif_set_real_num_tx_queues(netdev, mgp->num_slices);
3927 netif_set_real_num_rx_queues(netdev, mgp->num_slices);
3927 status = myri10ge_reset(mgp); 3928 status = myri10ge_reset(mgp);
3928 if (status != 0) { 3929 if (status != 0) {
3929 dev_err(&pdev->dev, "failed reset\n"); 3930 dev_err(&pdev->dev, "failed reset\n");