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

!15283 wifi: rtw89: fix race between cancel_hw_scan and hw_scan completion 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Huafei <lihuafei1@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/Q7DONSKDPP5NJRMXKNX5MTQMZOINLSST/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBPBK7 
 
Link:https://gitee.com/openeuler/kernel/pulls/15283

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents cbd7cd48 7723622c

drivers/net/wireless/realtek/rtw89/mac80211.c

+4 −2
Original line number Diff line number Diff line
@@ -872,11 +872,13 @@ static void rtw89_ops_cancel_hw_scan(struct ieee80211_hw *hw, 
	if (!RTW89_CHK_FW_FEATURE(SCAN_OFFLOAD, &rtwdev->fw))

		return;



	mutex_lock(&rtwdev->mutex);



	if (!rtwdev->scanning)

		return;

		goto out;



	mutex_lock(&rtwdev->mutex);

	rtw89_hw_scan_abort(rtwdev, vif);

out:

	mutex_unlock(&rtwdev->mutex);

}