|
Michal Suchanek |
833e62 |
From 6be4666221cafcfd58cc078aa8bd1ba11b699f6b Mon Sep 17 00:00:00 2001
|
|
Michal Suchanek |
833e62 |
From: Lijun Pan <ljp@linux.ibm.com>
|
|
Michal Suchanek |
833e62 |
Date: Mon, 14 Dec 2020 15:19:29 -0600
|
|
Michal Suchanek |
833e62 |
Subject: [PATCH] use __netdev_notify_peers in ibmvnic
|
|
Michal Suchanek |
833e62 |
|
|
Michal Suchanek |
833e62 |
References: bsc#1184114 ltc#192237 bsc#1183871 ltc#192139
|
|
Michal Suchanek |
833e62 |
Patch-mainline: v5.11-rc1
|
|
Michal Suchanek |
833e62 |
Git-commit: 6be4666221cafcfd58cc078aa8bd1ba11b699f6b
|
|
Michal Suchanek |
833e62 |
|
|
Michal Suchanek |
833e62 |
Start to use the lockless version of netdev_notify_peers.
|
|
Michal Suchanek |
833e62 |
|
|
Michal Suchanek |
833e62 |
Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
|
|
Michal Suchanek |
833e62 |
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
Michal Suchanek |
833e62 |
Acked-by: Michal Suchanek <msuchanek@suse.de>
|
|
Michal Suchanek |
833e62 |
---
|
|
Michal Suchanek |
833e62 |
drivers/net/ethernet/ibm/ibmvnic.c | 9 +++------
|
|
Michal Suchanek |
833e62 |
1 file changed, 3 insertions(+), 6 deletions(-)
|
|
Michal Suchanek |
833e62 |
|
|
Michal Suchanek |
833e62 |
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
|
|
Michal Suchanek |
833e62 |
index a2191392ca4f..f302504faa8a 100644
|
|
Michal Suchanek |
833e62 |
--- a/drivers/net/ethernet/ibm/ibmvnic.c
|
|
Michal Suchanek |
833e62 |
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
|
|
Michal Suchanek |
833e62 |
@@ -2171,10 +2171,8 @@ static int do_reset(struct ibmvnic_adapter *adapter,
|
|
Michal Suchanek |
833e62 |
napi_schedule(&adapter->napi[i]);
|
|
Michal Suchanek |
833e62 |
|
|
Michal Suchanek |
833e62 |
if (adapter->reset_reason == VNIC_RESET_FAILOVER ||
|
|
Michal Suchanek |
833e62 |
- adapter->reset_reason == VNIC_RESET_MOBILITY) {
|
|
Michal Suchanek |
833e62 |
- call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, netdev);
|
|
Michal Suchanek |
833e62 |
- call_netdevice_notifiers(NETDEV_RESEND_IGMP, netdev);
|
|
Michal Suchanek |
833e62 |
- }
|
|
Michal Suchanek |
833e62 |
+ adapter->reset_reason == VNIC_RESET_MOBILITY)
|
|
Michal Suchanek |
833e62 |
+ __netdev_notify_peers(netdev);
|
|
Michal Suchanek |
833e62 |
|
|
Michal Suchanek |
833e62 |
rc = 0;
|
|
Michal Suchanek |
833e62 |
|
|
Michal Suchanek |
833e62 |
@@ -2249,8 +2247,7 @@ static int do_hard_reset(struct ibmvnic_adapter *adapter,
|
|
Michal Suchanek |
833e62 |
goto out;
|
|
Michal Suchanek |
833e62 |
}
|
|
Michal Suchanek |
833e62 |
|
|
Michal Suchanek |
833e62 |
- call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, netdev);
|
|
Michal Suchanek |
833e62 |
- call_netdevice_notifiers(NETDEV_RESEND_IGMP, netdev);
|
|
Michal Suchanek |
833e62 |
+ __netdev_notify_peers(netdev);
|
|
Michal Suchanek |
833e62 |
out:
|
|
Michal Suchanek |
833e62 |
/* restore adapter state if reset failed */
|
|
Michal Suchanek |
833e62 |
if (rc)
|
|
Michal Suchanek |
833e62 |
--
|
|
Michal Suchanek |
833e62 |
2.26.2
|
|
Michal Suchanek |
833e62 |
|