aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHannes Frederic Sowa <hannes@stressinduktion.org>2016-04-18 15:19:43 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-21 15:35:43 -0400
commit41419b9303f085e8912406140355e45230fed22f (patch)
tree83c6166d9a603f9b124a32072a7677c6cef444e3
parent08d9910c3408531473766ec4d8b288e8ee2fe500 (diff)
fm10k: protect fm10k_open in fm10k_io_resume with rtnl_lock
fm10k_open requires rtnl_lock to be held. Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Shannon Nelson <shannon.nelson@intel.com> Cc: Carolyn Wyborny <carolyn.wyborny@intel.com> Cc: Don Skidmore <donald.c.skidmore@intel.com> Cc: Bruce Allan <bruce.w.allan@intel.com> Cc: John Ronciak <john.ronciak@intel.com> Cc: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/intel/fm10k/fm10k_pci.c2
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)
2287 /* reassociate interrupts */ 2287 /* reassociate interrupts */
2288 fm10k_mbx_request_irq(interface); 2288 fm10k_mbx_request_irq(interface);
2289 2289
2290 rtnl_lock();
2290 if (netif_running(netdev)) 2291 if (netif_running(netdev))
2291 err = fm10k_open(netdev); 2292 err = fm10k_open(netdev);
2293 rtnl_unlock();
2292 2294
2293 /* final check of hardware state before registering the interface */ 2295 /* final check of hardware state before registering the interface */
2294 err = err ? : fm10k_hw_ready(interface); 2296 err = err ? : fm10k_hw_ready(interface);