]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
ibmvnic: fix call_netdevice_notifiers in do_reset
authorLijun Pan <ljp@linux.ibm.com>
Fri, 20 Nov 2020 22:40:11 +0000 (16:40 -0600)
committerJakub Kicinski <kuba@kernel.org>
Sat, 21 Nov 2020 23:30:47 +0000 (15:30 -0800)
When netdev_notify_peers was substituted in
commit 986103e7920c ("net/ibmvnic: Fix RTNL deadlock during device reset"),
call_netdevice_notifiers(NETDEV_RESEND_IGMP, dev) was missed.
Fix it now.

Fixes: 986103e7920c ("net/ibmvnic: Fix RTNL deadlock during device reset")
Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
Reviewed-by: Dany Madden <drt@linux.ibm.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/ibm/ibmvnic.c

index da15913879f8e7d8c89f22823b70cb27342f479e..eface3543b2c398424f401559ec9cf1b4810675e 100644 (file)
@@ -2074,8 +2074,10 @@ 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) {
                call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, netdev);
+               call_netdevice_notifiers(NETDEV_RESEND_IGMP, netdev);
+       }
 
        rc = 0;