diff options
| author |   Thomas Falcon <tlfalcon@linux.ibm.com> | 2018-11-30 10:59:08 -0600 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-12-03 15:53:55 -0800 |
| commit | 986103e7920cabc0b910749e77ae5589d3934d52 (patch) | |
| tree | 67428949a0637abece04902c4c8583ff63601c9b /drivers/net | |
| parent | vhost: fix IOTLB locking (diff) | |
| download | linux-dev-986103e7920cabc0b910749e77ae5589d3934d52.tar.xz linux-dev-986103e7920cabc0b910749e77ae5589d3934d52.zip | |
net/ibmvnic: Fix RTNL deadlock during device reset
Commit a5681e20b541 ("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: a5681e20b541 ("net/ibmnvic: Fix deadlock problem in reset")
Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index c0203a0d5e3b..ed50b8dee44f 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -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); |