From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 6 Nov 2024 11:51:19 +0000 (+0100)
Subject: 5.15-stable patches
X-Git-Tag: v4.19.323~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a66b864560f63ca2ff5ef1eecef6f4a2bc9f54f;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	mac80211-always-have-ieee80211_sta_restart.patch
---

diff --git a/queue-5.15/mac80211-always-have-ieee80211_sta_restart.patch b/queue-5.15/mac80211-always-have-ieee80211_sta_restart.patch
new file mode 100644
index 00000000000..7ccc082692f
--- /dev/null
+++ b/queue-5.15/mac80211-always-have-ieee80211_sta_restart.patch
@@ -0,0 +1,39 @@
+From 3fa5a0f5b0d69e31c6476cd81afeca3cc25a4927 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Sat, 12 Mar 2022 22:19:58 +0100
+Subject: mac80211: always have ieee80211_sta_restart()
+
+From: Johannes Berg <johannes.berg@intel.com>
+
+commit 3fa5a0f5b0d69e31c6476cd81afeca3cc25a4927 upstream.
+
+When CONFIG_PM isn't defined we don't have the function
+ieee80211_sta_restart() compiled in, but we always need
+it now for firmware restart. Move it out of the ifdef.
+
+Fixes: 7d352ccf1e99 ("mac80211: Add support to trigger sta disconnect on hardware restart")
+Link: https://lore.kernel.org/r/20220312221957.1fa96c72db51.I8ecaa5f9402fede0272161e0531ab930b97fba3e@changeid
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/mac80211/mlme.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/mac80211/mlme.c
++++ b/net/mac80211/mlme.c
+@@ -4832,6 +4832,7 @@ void ieee80211_mgd_quiesce(struct ieee80
+ 
+ 	sdata_unlock(sdata);
+ }
++#endif
+ 
+ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
+ {
+@@ -4867,7 +4868,6 @@ void ieee80211_sta_restart(struct ieee80
+ 
+ 	sdata_unlock(sdata);
+ }
+-#endif
+ 
+ /* interface setup */
+ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
diff --git a/queue-5.15/series b/queue-5.15/series
index d77e6669371..06a6ee543e5 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -70,3 +70,4 @@ mm-shmem-fix-data-race-in-shmem_getattr.patch
 revert-drm-mipi-dsi-set-the-fwnode-for-mipi_dsi_device.patch
 drm-i915-fix-potential-context-uafs.patch
 vt-prevent-kernel-infoleak-in-con_font_get.patch
+mac80211-always-have-ieee80211_sta_restart.patch