Unverified Commit 3e937023 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10157 v2 wifi: mac80211: Fix deadlock in ieee80211_sta_ps_deliver_wakeup() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yue Haibing <yuehaibing@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MM5XHURNCSKAW3ZBHWYEK2BZ6Z6GWG74/ 
 
https://gitee.com/src-openeuler/kernel/issues/IACRSL 
 
Link:https://gitee.com/openeuler/kernel/pulls/10157

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents ecafc107 59bbd649

net/mac80211/sta_info.c

+2 −2
Original line number Diff line number Diff line
@@ -1340,7 +1340,7 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta) 
	skb_queue_head_init(&pending);



	/* sync with ieee80211_tx_h_unicast_ps_buf */

	spin_lock(&sta->ps_lock);

	spin_lock_bh(&sta->ps_lock);

	/* Send all buffered frames to the station */

	for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {

		int count = skb_queue_len(&pending), tmp;
@@ -1369,7 +1369,7 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta) 
	 */

	clear_sta_flag(sta, WLAN_STA_PSPOLL);

	clear_sta_flag(sta, WLAN_STA_UAPSD);

	spin_unlock(&sta->ps_lock);

	spin_unlock_bh(&sta->ps_lock);



	atomic_dec(&ps->num_sta_ps);