diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-09-27 04:28:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-28 01:09:53 -0400 |
commit | 21adef3e2959160df31f8516883431e5595f9e50 (patch) | |
tree | 7dc844b98e112d6e9f79744a86366c9cc22acc9b /drivers/net/igb | |
parent | fe06912333bb9776b0429100b195080809984ae4 (diff) |
igb: Use netif_set_real_num_{rx,tx}_queues()
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb')
-rw-r--r-- | drivers/net/igb/igb_main.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 0394ca95f3ba..55edcb74abf4 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -988,7 +988,7 @@ static void igb_clear_interrupt_scheme(struct igb_adapter *adapter) | |||
988 | * Attempt to configure interrupts using the best available | 988 | * Attempt to configure interrupts using the best available |
989 | * capabilities of the hardware and kernel. | 989 | * capabilities of the hardware and kernel. |
990 | **/ | 990 | **/ |
991 | static void igb_set_interrupt_capability(struct igb_adapter *adapter) | 991 | static int igb_set_interrupt_capability(struct igb_adapter *adapter) |
992 | { | 992 | { |
993 | int err; | 993 | int err; |
994 | int numvecs, i; | 994 | int numvecs, i; |
@@ -1054,8 +1054,10 @@ msi_only: | |||
1054 | if (!pci_enable_msi(adapter->pdev)) | 1054 | if (!pci_enable_msi(adapter->pdev)) |
1055 | adapter->flags |= IGB_FLAG_HAS_MSI; | 1055 | adapter->flags |= IGB_FLAG_HAS_MSI; |
1056 | out: | 1056 | out: |
1057 | /* Notify the stack of the (possibly) reduced Tx Queue count. */ | 1057 | /* Notify the stack of the (possibly) reduced queue counts. */ |
1058 | adapter->netdev->real_num_tx_queues = adapter->num_tx_queues; | 1058 | netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues); |
1059 | return netif_set_real_num_rx_queues(adapter->netdev, | ||
1060 | adapter->num_rx_queues); | ||
1059 | } | 1061 | } |
1060 | 1062 | ||
1061 | /** | 1063 | /** |
@@ -1154,7 +1156,9 @@ static int igb_init_interrupt_scheme(struct igb_adapter *adapter) | |||
1154 | struct pci_dev *pdev = adapter->pdev; | 1156 | struct pci_dev *pdev = adapter->pdev; |
1155 | int err; | 1157 | int err; |
1156 | 1158 | ||
1157 | igb_set_interrupt_capability(adapter); | 1159 | err = igb_set_interrupt_capability(adapter); |
1160 | if (err) | ||
1161 | return err; | ||
1158 | 1162 | ||
1159 | err = igb_alloc_q_vectors(adapter); | 1163 | err = igb_alloc_q_vectors(adapter); |
1160 | if (err) { | 1164 | if (err) { |