6.1-stable patches

added patches:
	net-hsr-hsr_slave-fix-the-promiscuous-mode-in-offload-mode.patch

diff --git a/queue-6.1/net-hsr-hsr_slave-fix-the-promiscuous-mode-in-offload-mode.patch b/queue-6.1/net-hsr-hsr_slave-fix-the-promiscuous-mode-in-offload-mode.patch
new file mode 100644 (file)
index 0000000..ce028b0
--- /dev/null
+++ b/queue-6.1/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 <r-gunasekaran@ti.com>
+Date: Fri, 22 Mar 2024 15:34:47 +0530
+Subject: net: hsr: hsr_slave: Fix the promiscuous mode in offload mode
+
+From: Ravi Gunasekaran <r-gunasekaran@ti.com>
+
+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 <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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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-6.1/series b/queue-6.1/series
index 06c0f3904a78b338a4e1c8b4bdebc95a4e0a032b..1074422c953ff6304fac51d43fa27c3511b1aa34 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -76,3 +76,4 @@ 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
 soc-qcom-mdt_loader-fix-error-return-values-in-mdt_header_valid.patch
 soc-qcom-mdt_loader-deal-with-zero-e_shentsize.patch
+net-hsr-hsr_slave-fix-the-promiscuous-mode-in-offload-mode.patch