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

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

ixgbe: 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 21adef3e

drivers/net/ixgbe/ixgbe_main.c

+11 −5
Original line number Diff line number Diff line
@@ -4088,7 +4088,7 @@ static inline bool ixgbe_set_sriov_queues(struct ixgbe_adapter *adapter) 
 * fallthrough conditions.

 *

 **/

static void ixgbe_set_num_queues(struct ixgbe_adapter *adapter)

static int ixgbe_set_num_queues(struct ixgbe_adapter *adapter)

{

	/* Start with base case */

	adapter->num_rx_queues = 1;
@@ -4097,7 +4097,7 @@ static void ixgbe_set_num_queues(struct ixgbe_adapter *adapter) 
	adapter->num_rx_queues_per_pool = 1;



	if (ixgbe_set_sriov_queues(adapter))

		return;

		goto done;



#ifdef IXGBE_FCOE

	if (ixgbe_set_fcoe_queues(adapter))
@@ -4120,8 +4120,10 @@ static void ixgbe_set_num_queues(struct ixgbe_adapter *adapter) 
	adapter->num_tx_queues = 1;



done:

	/* Notify the stack of the (possibly) reduced Tx Queue count. */

	/* Notify the stack of the (possibly) reduced queue counts. */

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

	return netif_set_real_num_rx_queues(adapter->netdev,

					    adapter->num_rx_queues);

}



static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,
@@ -4550,7 +4552,9 @@ static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter) 
	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)

		ixgbe_disable_sriov(adapter);



	ixgbe_set_num_queues(adapter);

	err = ixgbe_set_num_queues(adapter);

	if (err)

		return err;



	err = pci_enable_msi(adapter->pdev);

	if (!err) {
@@ -4675,7 +4679,9 @@ int ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter) 
	int err;



	/* Number of supported queues */

	ixgbe_set_num_queues(adapter);

	err = ixgbe_set_num_queues(adapter);

	if (err)

		return err;



	err = ixgbe_set_interrupt_capability(adapter);

	if (err) {