commit e748d0fd66ab ("net: hsr: Disable promiscuous mode in
offload mode") disables promiscuous mode of slave devices
while creating an HSR interface. But while deleting the
HSR interface, it does not take care of it. It decreases the
promiscuous mode count, which eventually enables promiscuous
mode on the slave devices when creating HSR interface again.
Fix this by not decrementing the promiscuous mode count while
deleting the HSR interface when offload is enabled.
Fixes: e748d0fd66ab ("net: hsr: Disable promiscuous mode in offload mode")
Signed-off-by: Ravi Gunasekaran <[email protected]>
---
net/hsr/hsr_slave.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c
index e5742f2a2d52..1b6457f357bd 100644
--- a/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@ -220,7 +220,8 @@ void hsr_del_port(struct hsr_port *port)
netdev_update_features(master->dev);
dev_set_mtu(master->dev, hsr_get_max_mtu(hsr));
netdev_rx_handler_unregister(port->dev);
- dev_set_promiscuity(port->dev, -1);
+ if (!port->hsr->fwd_offloaded)
+ dev_set_promiscuity(port->dev, -1);
netdev_upper_dev_unlink(port->dev, master->dev);
}
--
2.17.1
Fri, Mar 22, 2024 at 11:04:47AM CET, [email protected] wrote:
>commit e748d0fd66ab ("net: hsr: Disable promiscuous mode in
>offload mode") disables promiscuous mode of slave devices
>while creating an HSR interface. But while deleting the
>HSR interface, it does not take care of it. It decreases the
>promiscuous mode count, which eventually enables promiscuous
>mode on the slave devices when creating HSR interface again.
>
>Fix this by not decrementing the promiscuous mode count while
>deleting the HSR interface when offload is enabled.
>
>Fixes: e748d0fd66ab ("net: hsr: Disable promiscuous mode in offload mode")
>Signed-off-by: Ravi Gunasekaran <[email protected]>
Reviewed-by: Jiri Pirko <[email protected]>
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
On Fri, 22 Mar 2024 15:34:47 +0530 you wrote:
> commit e748d0fd66ab ("net: hsr: Disable promiscuous mode in
> offload mode") disables promiscuous mode of slave devices
> while creating an HSR interface. But while deleting the
> HSR interface, it does not take care of it. It decreases the
> promiscuous mode count, which eventually enables promiscuous
> mode on the slave devices when creating HSR interface again.
>
> [...]
Here is the summary with links:
- [net] net: hsr: hsr_slave: Fix the promiscuous mode in offload mode
https://git.kernel.org/netdev/net/c/b11c81731c81
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html