Skip to content

Commit b11c817

Browse files
Ravi Gunasekarankuba-moo
authored andcommitted
net: hsr: hsr_slave: Fix the promiscuous mode in offload mode
commit e748d0f ("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: e748d0f ("net: hsr: Disable promiscuous mode in offload mode") Signed-off-by: Ravi Gunasekaran <r-gunasekaran@ti.com> Reviewed-by: Jiri Pirko <jiri@nvidia.com> Link: https://lore.kernel.org/r/20240322100447.27615-1-r-gunasekaran@ti.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 3a38a82 commit b11c817

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

net/hsr/hsr_slave.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,8 @@ void hsr_del_port(struct hsr_port *port)
220220
netdev_update_features(master->dev);
221221
dev_set_mtu(master->dev, hsr_get_max_mtu(hsr));
222222
netdev_rx_handler_unregister(port->dev);
223-
dev_set_promiscuity(port->dev, -1);
223+
if (!port->hsr->fwd_offloaded)
224+
dev_set_promiscuity(port->dev, -1);
224225
netdev_upper_dev_unlink(port->dev, master->dev);
225226
}
226227

0 commit comments

Comments
 (0)