From 8a3a58ab75a2b54ffc828c159055163fd21a32b6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 6 Nov 2024 12:53:38 +0100 Subject: [PATCH] 5.10-stable patches added patches: mac80211-always-have-ieee80211_sta_restart.patch --- ...11-always-have-ieee80211_sta_restart.patch | 39 +++++++++++++++++++ queue-5.10/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-5.10/mac80211-always-have-ieee80211_sta_restart.patch diff --git a/queue-5.10/mac80211-always-have-ieee80211_sta_restart.patch b/queue-5.10/mac80211-always-have-ieee80211_sta_restart.patch new file mode 100644 index 00000000000..5d45f16c821 --- /dev/null +++ b/queue-5.10/mac80211-always-have-ieee80211_sta_restart.patch @@ -0,0 +1,39 @@ +From 3fa5a0f5b0d69e31c6476cd81afeca3cc25a4927 Mon Sep 17 00:00:00 2001 +From: Johannes Berg +Date: Sat, 12 Mar 2022 22:19:58 +0100 +Subject: mac80211: always have ieee80211_sta_restart() + +From: Johannes Berg + +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 +Signed-off-by: Greg Kroah-Hartman +--- + net/mac80211/mlme.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/mac80211/mlme.c ++++ b/net/mac80211/mlme.c +@@ -4778,6 +4778,7 @@ void ieee80211_mgd_quiesce(struct ieee80 + + sdata_unlock(sdata); + } ++#endif + + void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata) + { +@@ -4813,7 +4814,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.10/series b/queue-5.10/series index 77e4089efd0..d542508aea4 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -107,3 +107,4 @@ mm-shmem-fix-data-race-in-shmem_getattr.patch revert-drm-mipi-dsi-set-the-fwnode-for-mipi_dsi_device.patch drm-shmem-helper-fix-bug_on-on-mmap-prot_write-map_private.patch vt-prevent-kernel-infoleak-in-con_font_get.patch +mac80211-always-have-ieee80211_sta_restart.patch -- 2.47.3