]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ixgbe: add missing rtnl_lock in PM resume path
authorBenjamin Poirier <bpoirier@suse.de>
Fri, 6 Apr 2012 07:20:21 +0000 (07:20 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 17 Apr 2012 22:40:34 +0000 (15:40 -0700)
Upon resume from standby, ixgbe may trigger the ASSERT_RTNL() in
netif_set_real_num_tx_queues(). The call stack is:
netif_set_real_num_tx_queues
ixgbe_set_num_queues
ixgbe_init_interrupt_scheme
ixgbe_resume

Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
Tested-by: Stephen Ko <stephen.s.ko@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

index dac7c01f833230ae5112fb726ed042629903ce57..9e2be8c45c2da67b1dacb0a74799efd5f5cbefc6 100644 (file)
@@ -4836,7 +4836,9 @@ static int ixgbe_resume(struct pci_dev *pdev)
 
        pci_wake_from_d3(pdev, false);
 
+       rtnl_lock();
        err = ixgbe_init_interrupt_scheme(adapter);
+       rtnl_unlock();
        if (err) {
                e_dev_err("Cannot initialize interrupts for device\n");
                return err;