Commit c9920268 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

myri10ge: Use netif_set_real_num_{rx, tx}_queues() 



Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 206d6b32

drivers/net/myri10ge/myri10ge.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -990,7 +990,7 @@ static int myri10ge_reset(struct myri10ge_priv *mgp) 
		 * RX queues, so if we get an error, first retry using a

		 * RX queues, so if we get an error, first retry using a

		 * single TX queue before giving up */

		 * single TX queue before giving up */

		if (status != 0 && mgp->dev->real_num_tx_queues > 1) {

		if (status != 0 && mgp->dev->real_num_tx_queues > 1) {

			mgp->dev->real_num_tx_queues = 1;

			netif_set_real_num_tx_queues(mgp->dev, 1);

			cmd.data0 = mgp->num_slices;

			cmd.data0 = mgp->num_slices;

			cmd.data1 = MXGEFW_SLICE_INTR_MODE_ONE_PER_SLICE;

			cmd.data1 = MXGEFW_SLICE_INTR_MODE_ONE_PER_SLICE;

			status = myri10ge_send_cmd(mgp,

			status = myri10ge_send_cmd(mgp,
@@ -3923,7 +3923,8 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		dev_err(&pdev->dev, "failed to alloc slice state\n");

		dev_err(&pdev->dev, "failed to alloc slice state\n");

		goto abort_with_firmware;

		goto abort_with_firmware;

	}

	}

	netdev->real_num_tx_queues = mgp->num_slices;

	netif_set_real_num_tx_queues(netdev, mgp->num_slices);

	netif_set_real_num_rx_queues(netdev, mgp->num_slices);

	status = myri10ge_reset(mgp);

	status = myri10ge_reset(mgp);

	if (status != 0) {

	if (status != 0) {

		dev_err(&pdev->dev, "failed reset\n");

		dev_err(&pdev->dev, "failed reset\n");