From: Jacob Keller <jacob.e.keller@intel.com>
Date: Wed, 27 Jul 2016 19:02:33 +0000 (-0700)
Subject: i40evf: add missing rtnl_lock() around i40evf_set_interrupt_capability
X-Git-Tag: v4.1.12-98.0.20170517_2143~42^2~214
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a7dea0604ae5e0321fd3af0be13d4ebf5e5f5006;p=users%2Fjedix%2Flinux-maple.git

i40evf: add missing rtnl_lock() around i40evf_set_interrupt_capability

Orabug: 24568124

The function calls netif_set_real_num_(tx|rx)_queues, both of which
should be done only under rntl lock. Unfortunately the
i40evf_init_task did not hold the rtnl_lock as necessary. This patch
adds the locking needed.

Change-ID: Ib72a21c3ce22b71a226b16f9bbe0f5f8cc3e849b
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 62fe2a865e6ddc92f574bafacf8376613d8c08f2)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
---

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index ab8391d65ffb9..e1d86213662a1 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1420,7 +1420,9 @@ int i40evf_init_interrupt_scheme(struct i40evf_adapter *adapter)
 {
 	int err;
 
+	rtnl_lock();
 	err = i40evf_set_interrupt_capability(adapter);
+	rtnl_unlock();
 	if (err) {
 		dev_err(&adapter->pdev->dev,
 			"Unable to setup interrupt capabilities\n");