]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ixgbevf: Add lock around ixgbevf_reinit_locked call
authorDon Skidmore <donald.c.skidmore@intel.com>
Tue, 12 Jul 2016 01:29:56 +0000 (21:29 -0400)
committerChuck Anderson <chuck.anderson@oracle.com>
Sat, 25 Feb 2017 05:47:48 +0000 (21:47 -0800)
Orabug: 24568240

The function ixgbevf_reinit_locked() assumes you have the rtnl lock
however we didn't when calling from the service task.  This patch
corrects that.

Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 8e8247ab98315e096b812a68381ca812f0b0b5e3)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

index a47ca7e1506a3fdfd1b1261bc05907334e33eeb3..1cfa5fee00911f1c53200b64f66417f192754fd9 100644 (file)
@@ -2778,7 +2778,9 @@ static void ixgbevf_reset_subtask(struct ixgbevf_adapter *adapter)
 
        adapter->tx_timeout_count++;
 
+       rtnl_lock();
        ixgbevf_reinit_locked(adapter);
+       rtnl_unlock();
 }
 
 /**