aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2008-08-26 07:25:13 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-08-27 05:16:31 -0400
commit34a20e89739e9ac1cb89bdf430b694d2c946ebff (patch)
treeab9994e0e01d263654d120282a42e03bb398b3fa
parentfe59de38c58d3eedc025be61ff3055a41776bbd4 (diff)
igb: fix setting the number of tx queues
The real_num_tx_queues was not being set when in MSI-X only mode. This patch corrects that path so all interrupt types are correctly configured. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r--drivers/net/igb/igb_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 465a810b670a..e6eb13a303c0 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -521,7 +521,7 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter)
521 adapter->msix_entries, 521 adapter->msix_entries,
522 numvecs); 522 numvecs);
523 if (err == 0) 523 if (err == 0)
524 return; 524 goto out;
525 525
526 igb_reset_interrupt_capability(adapter); 526 igb_reset_interrupt_capability(adapter);
527 527
@@ -531,7 +531,7 @@ msi_only:
531 adapter->num_tx_queues = 1; 531 adapter->num_tx_queues = 1;
532 if (!pci_enable_msi(adapter->pdev)) 532 if (!pci_enable_msi(adapter->pdev))
533 adapter->flags |= IGB_FLAG_HAS_MSI; 533 adapter->flags |= IGB_FLAG_HAS_MSI;
534 534out:
535 /* Notify the stack of the (possibly) reduced Tx Queue count. */ 535 /* Notify the stack of the (possibly) reduced Tx Queue count. */
536 adapter->netdev->real_num_tx_queues = adapter->num_tx_queues; 536 adapter->netdev->real_num_tx_queues = adapter->num_tx_queues;
537 return; 537 return;