Unverified Commit d9998017 authored Apr 15, 2024 by openeuler-ci-bot Committed by Gitee Apr 15, 2024

!6049 wifi: mac80211: fix race condition on enabling fast-xmit

Merge Pull Request from: @ci-robot 
 
PR sync from: Ziyang Xuan <william.xuanziyang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/NJRHASY7S3WHTKO2Y4NHZR5BQVXYHCZT/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9E2MI 
 
Link:https://gitee.com/openeuler/kernel/pulls/6049

 

Reviewed-by: Yue Haibing <yuehaibing@huawei.com>
Reviewed-by: Liu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

parents 4ca7201e c2e1ca48

net/mac80211/sta_info.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -611,6 +611,8 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
		if (ieee80211_vif_is_mesh(&sdata->vif))
		mesh_accept_plinks_update(sdata);

		ieee80211_check_fast_xmit(sta);

		return 0;
		out_remove:
		sta_info_hash_del(local, sta);

net/mac80211/tx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2844,7 +2844,7 @@ void ieee80211_check_fast_xmit(struct sta_info *sta)
		sdata->vif.type == NL80211_IFTYPE_STATION)
		goto out;

		if (!test_sta_flag(sta, WLAN_STA_AUTHORIZED))
		if (!test_sta_flag(sta, WLAN_STA_AUTHORIZED) \|\| !sta->uploaded)
		goto out;

		if (test_sta_flag(sta, WLAN_STA_PS_STA) \|\|