summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorNathan Fontenot <nfont@linux.vnet.ibm.com>2018-04-11 17:09:38 +0200
committerDavid S. Miller <davem@davemloft.net>2018-04-13 03:51:53 +0200
commitebc701b796a67a5785399dcbc83d90e3b5f1e02f (patch)
tree7b386553deb1996579ae0b69b301271eb31b3c81 /drivers
parentibmvnic: Handle all login error conditions (diff)
downloadlinux-ebc701b796a67a5785399dcbc83d90e3b5f1e02f.tar.xz
linux-ebc701b796a67a5785399dcbc83d90e3b5f1e02f.zip
ibmvnic: Do not notify peers on parameter change resets
When attempting to change the driver parameters, such as the MTU value or number of queues, do not call netdev_notify_peers(). Doing so will deadlock on the rtnl_lock. Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/ibm/ibmvnic.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index d35f29d7af91..f4a56a3c07ad 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1843,7 +1843,8 @@ static int do_reset(struct ibmvnic_adapter *adapter,
for (i = 0; i < adapter->req_rx_queues; i++)
napi_schedule(&adapter->napi[i]);
- if (adapter->reset_reason != VNIC_RESET_FAILOVER)
+ if (adapter->reset_reason != VNIC_RESET_FAILOVER &&
+ adapter->reset_reason != VNIC_RESET_CHANGE_PARAM)
netdev_notify_peers(netdev);
netif_carrier_on(netdev);