Commit 21adef3e authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller

igb: 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 fe069123
...@@ -988,7 +988,7 @@ static void igb_clear_interrupt_scheme(struct igb_adapter *adapter) ...@@ -988,7 +988,7 @@ static void igb_clear_interrupt_scheme(struct igb_adapter *adapter)
* Attempt to configure interrupts using the best available * Attempt to configure interrupts using the best available
* capabilities of the hardware and kernel. * capabilities of the hardware and kernel.
**/ **/
static void igb_set_interrupt_capability(struct igb_adapter *adapter) static int igb_set_interrupt_capability(struct igb_adapter *adapter)
{ {
int err; int err;
int numvecs, i; int numvecs, i;
...@@ -1054,8 +1054,10 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter) ...@@ -1054,8 +1054,10 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter)
if (!pci_enable_msi(adapter->pdev)) if (!pci_enable_msi(adapter->pdev))
adapter->flags |= IGB_FLAG_HAS_MSI; adapter->flags |= IGB_FLAG_HAS_MSI;
out: out:
/* Notify the stack of the (possibly) reduced Tx Queue count. */ /* Notify the stack of the (possibly) reduced queue counts. */
adapter->netdev->real_num_tx_queues = adapter->num_tx_queues; 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);
} }
/** /**
...@@ -1154,7 +1156,9 @@ static int igb_init_interrupt_scheme(struct igb_adapter *adapter) ...@@ -1154,7 +1156,9 @@ static int igb_init_interrupt_scheme(struct igb_adapter *adapter)
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = adapter->pdev;
int err; int err;
igb_set_interrupt_capability(adapter); err = igb_set_interrupt_capability(adapter);
if (err)
return err;
err = igb_alloc_q_vectors(adapter); err = igb_alloc_q_vectors(adapter);
if (err) { if (err) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment