diff options
author | Hannes Frederic Sowa <[email protected]> | 2016-04-18 21:19:43 +0200 |
---|---|---|
committer | David S. Miller <[email protected]> | 2016-04-21 15:35:43 -0400 |
commit | 41419b9303f085e8912406140355e45230fed22f (patch) | |
tree | 83c6166d9a603f9b124a32072a7677c6cef444e3 | |
parent | 08d9910c3408531473766ec4d8b288e8ee2fe500 (diff) |
fm10k: protect fm10k_open in fm10k_io_resume with rtnl_lock
fm10k_open requires rtnl_lock to be held.
Cc: Jeff Kirsher <[email protected]>
Cc: Jesse Brandeburg <[email protected]>
Cc: Shannon Nelson <[email protected]>
Cc: Carolyn Wyborny <[email protected]>
Cc: Don Skidmore <[email protected]>
Cc: Bruce Allan <[email protected]>
Cc: John Ronciak <[email protected]>
Cc: Mitch Williams <[email protected]>
Signed-off-by: Hannes Frederic Sowa <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
-rw-r--r-- | drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c index 404f47ae14b6..206a466999ed 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c @@ -2287,8 +2287,10 @@ static void fm10k_io_resume(struct pci_dev *pdev) /* reassociate interrupts */ fm10k_mbx_request_irq(interface); + rtnl_lock(); if (netif_running(netdev)) err = fm10k_open(netdev); + rtnl_unlock(); /* final check of hardware state before registering the interface */ err = err ? : fm10k_hw_ready(interface); |