Commit 1ef7cbe1 authored by Johannes Berg's avatar Johannes Berg Committed by Liu Jian
Browse files

mac80211: always have ieee80211_sta_restart() 

stable inclusion
from stable-v5.10.229
commit 7948c22cc70b329be95c89690dfb1d83b184f6e6
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB5KQF
CVE: CVE-2024-53059

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7948c22cc70b329be95c89690dfb1d83b184f6e6

-------------------------------------------------

commit 3fa5a0f5 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: 7d352ccf ("mac80211: Add support to trigger sta disconnect on hardware restart")
Link: https://lore.kernel.org/r/20220312221957.1fa96c72db51.I8ecaa5f9402fede0272161e0531ab930b97fba3e@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>
parent 07552b9a

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -4778,6 +4778,7 @@ void ieee80211_mgd_quiesce(struct ieee80211_sub_if_data *sdata) 


	sdata_unlock(sdata);

}

#endif



void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)

{
@@ -4813,7 +4814,6 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata) 


	sdata_unlock(sdata);

}

#endif



/* interface setup */

void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)