From: Greg Kroah-Hartman Date: Wed, 17 Sep 2025 15:13:54 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v6.1.153~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa66267620c22533688ee30da85236373e647dc1;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: net-hsr-hsr_slave-fix-the-promiscuous-mode-in-offload-mode.patch --- diff --git a/queue-5.15/net-hsr-hsr_slave-fix-the-promiscuous-mode-in-offload-mode.patch b/queue-5.15/net-hsr-hsr_slave-fix-the-promiscuous-mode-in-offload-mode.patch new file mode 100644 index 0000000000..ce028b01bf --- /dev/null +++ b/queue-5.15/net-hsr-hsr_slave-fix-the-promiscuous-mode-in-offload-mode.patch @@ -0,0 +1,41 @@ +From b11c81731c810efe592e510bb0110e0db6877419 Mon Sep 17 00:00:00 2001 +From: Ravi Gunasekaran +Date: Fri, 22 Mar 2024 15:34:47 +0530 +Subject: net: hsr: hsr_slave: Fix the promiscuous mode in offload mode + +From: Ravi Gunasekaran + +commit b11c81731c810efe592e510bb0110e0db6877419 upstream. + +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 +Reviewed-by: Jiri Pirko +Link: https://lore.kernel.org/r/20240322100447.27615-1-r-gunasekaran@ti.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/hsr/hsr_slave.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/net/hsr/hsr_slave.c ++++ b/net/hsr/hsr_slave.c +@@ -226,7 +226,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); + } + diff --git a/queue-5.15/series b/queue-5.15/series index f81f24266f..243ae9da96 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -62,3 +62,4 @@ soc-qcom-mdt_loader-deal-with-zero-e_shentsize.patch drm-amdgpu-fix-a-memory-leak-in-fence-cleanup-when-unloading.patch drm-i915-power-fix-size-for-for_each_set_bit-in-abox-iteration.patch mm-memory-failure-fix-vm_bug_on_page-pagepoisoned-page-when-unpoison-memory.patch +net-hsr-hsr_slave-fix-the-promiscuous-mode-in-offload-mode.patch