Commit 986103e7 authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller
Browse files

net/ibmvnic: Fix RTNL deadlock during device reset



Commit a5681e20 ("net/ibmnvic: Fix deadlock problem
in reset") made the change to hold the RTNL lock during
driver reset but still calls netdev_notify_peers, which
results in a deadlock. Instead, use call_netdevice_notifiers,
which is functionally the same except that it does not
take the RTNL lock again.

Fixes: a5681e20 ("net/ibmnvic: Fix deadlock problem in reset")
Signed-off-by: default avatarThomas Falcon <tlfalcon@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e3f78718
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1859,7 +1859,7 @@ static int do_reset(struct ibmvnic_adapter *adapter,

	if (adapter->reset_reason != VNIC_RESET_FAILOVER &&
	    adapter->reset_reason != VNIC_RESET_CHANGE_PARAM)
		netdev_notify_peers(netdev);
		call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, netdev);

	netif_carrier_on(netdev);