diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index d2235005528..8683ca4748c 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
@@ -1111,9 +1111,12 @@ msi_only: | |||
1111 | adapter->flags |= IGB_FLAG_HAS_MSI; | 1111 | adapter->flags |= IGB_FLAG_HAS_MSI; |
1112 | out: | 1112 | out: |
1113 | /* Notify the stack of the (possibly) reduced queue counts. */ | 1113 | /* Notify the stack of the (possibly) reduced queue counts. */ |
1114 | rtnl_lock(); | ||
1114 | netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues); | 1115 | netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues); |
1115 | return netif_set_real_num_rx_queues(adapter->netdev, | 1116 | err = netif_set_real_num_rx_queues(adapter->netdev, |
1116 | adapter->num_rx_queues); | 1117 | adapter->num_rx_queues); |
1118 | rtnl_unlock(); | ||
1119 | return err; | ||
1117 | } | 1120 | } |
1118 | 1121 | ||
1119 | /** | 1122 | /** |
@@ -6796,18 +6799,7 @@ static int igb_resume(struct device *dev) | |||
6796 | pci_enable_wake(pdev, PCI_D3hot, 0); | 6799 | pci_enable_wake(pdev, PCI_D3hot, 0); |
6797 | pci_enable_wake(pdev, PCI_D3cold, 0); | 6800 | pci_enable_wake(pdev, PCI_D3cold, 0); |
6798 | 6801 | ||
6799 | if (!rtnl_is_locked()) { | 6802 | if (igb_init_interrupt_scheme(adapter)) { |
6800 | /* | ||
6801 | * shut up ASSERT_RTNL() warning in | ||
6802 | * netif_set_real_num_tx/rx_queues. | ||
6803 | */ | ||
6804 | rtnl_lock(); | ||
6805 | err = igb_init_interrupt_scheme(adapter); | ||
6806 | rtnl_unlock(); | ||
6807 | } else { | ||
6808 | err = igb_init_interrupt_scheme(adapter); | ||
6809 | } | ||
6810 | if (err) { | ||
6811 | dev_err(&pdev->dev, "Unable to allocate memory for queues\n"); | 6803 | dev_err(&pdev->dev, "Unable to allocate memory for queues\n"); |
6812 | return -ENOMEM; | 6804 | return -ENOMEM; |
6813 | } | 6805 | } |