Skip to content

Commit

Permalink
wifi: rtw89: Fix TX fail with A2DP after scanning
Browse files Browse the repository at this point in the history
There might be some racing between BT and WiFi after scan. Since
one of the TX related register will be modified by both FW and
rtw89_set_channel() in driver, which could cause Tx fail. Reorder
the calling sequence to only notify coexistence mechanism after
rtw89_set_channel() is called, so that there are no concurrent
operations.

Fixes: 5f499ce ("wifi: rtw89: pause/proceed MCC for ROC and HW scan")
Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20241021063219.22613-1-pkshih@realtek.com
  • Loading branch information
Po-Hao Huang authored and Ping-Ke Shih committed Oct 25, 2024
1 parent 9dffa44 commit f16c40a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/realtek/rtw89/fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -6721,6 +6721,8 @@ void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev,
if (!rtwvif_link)
return;

rtw89_chanctx_proceed(rtwdev);

rtwvif = rtwvif_link->rtwvif;

reg = rtw89_mac_reg_by_idx(rtwdev, mac->rx_fltr, rtwvif_link->mac_idx);
Expand All @@ -6738,8 +6740,6 @@ void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev,
scan_info->last_chan_idx = 0;
scan_info->scanning_vif = NULL;
scan_info->abort = false;

rtw89_chanctx_proceed(rtwdev);
}

void rtw89_hw_scan_abort(struct rtw89_dev *rtwdev,
Expand Down

0 comments on commit f16c40a

Please sign in to comment.