Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2d00eca authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher
Browse files

ixgbevf: setup queue counts 



Add calls for netif_set_real_num_t/rx_queues() in ixgbevf_open().
Make sure that calls to ixgbevf_open() are rtnl protected and improve
the error handling when setting up multiple queues.

Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f15c5ba5

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+29 −15
Original line number Diff line number Diff line
@@ -3119,9 +3119,14 @@ static int ixgbevf_setup_all_tx_resources(struct ixgbevf_adapter *adapter) 
		if (!err)

			continue;

		hw_dbg(&adapter->hw, "Allocation for Tx Queue %u failed\n", i);

		break;

		goto err_setup_tx;

	}



	return 0;

err_setup_tx:

	/* rewind the index freeing the rings as we go */

	while (i--)

		ixgbevf_free_tx_resources(adapter->tx_ring[i]);

	return err;

}
@@ -3179,8 +3184,14 @@ static int ixgbevf_setup_all_rx_resources(struct ixgbevf_adapter *adapter) 
		if (!err)

			continue;

		hw_dbg(&adapter->hw, "Allocation for Rx Queue %u failed\n", i);

		break;

		goto err_setup_rx;

	}



	return 0;

err_setup_rx:

	/* rewind the index freeing the rings as we go */

	while (i--)

		ixgbevf_free_rx_resources(adapter->rx_ring[i]);

	return err;

}
@@ -3285,18 +3296,27 @@ int ixgbevf_open(struct net_device *netdev) 
	if (err)

		goto err_req_irq;



	/* Notify the stack of the actual queue counts. */

	err = netif_set_real_num_tx_queues(netdev, adapter->num_tx_queues);

	if (err)

		goto err_set_queues;



	err = netif_set_real_num_rx_queues(netdev, adapter->num_rx_queues);

	if (err)

		goto err_set_queues;



	ixgbevf_up_complete(adapter);



	return 0;



err_set_queues:

	ixgbevf_free_irq(adapter);

err_req_irq:

	ixgbevf_down(adapter);

err_setup_rx:

	ixgbevf_free_all_rx_resources(adapter);

err_setup_tx:

err_setup_rx:

	ixgbevf_free_all_tx_resources(adapter);

err_setup_tx:

	ixgbevf_reset(adapter);



err_setup_reset:



	return err;
@@ -3948,17 +3968,11 @@ static int ixgbevf_resume(struct pci_dev *pdev) 


	rtnl_lock();

	err = ixgbevf_init_interrupt_scheme(adapter);

	rtnl_unlock();

	if (err) {

		dev_err(&pdev->dev, "Cannot initialize interrupts\n");

		return err;

	}



	if (netif_running(netdev)) {

	if (!err && netif_running(netdev))

		err = ixgbevf_open(netdev);

	rtnl_unlock();

	if (err)

		return err;

	}



	netif_device_attach(netdev);