Commit ae04f15b authored by Po-Hao Huang's avatar Po-Hao Huang Committed by Kalle Valo
Browse files

rtw88: refine unwanted h2c command 



Don't send beacon filter h2c when there is no valid context.
Return early instead of printing out warning messages, so others
won't get confused.

Signed-off-by: default avatarPo-Hao Huang <phhuang@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210528032901.12927-3-pkshih@realtek.com
parent 7b80f3e4

drivers/net/wireless/realtek/rtw88/fw.c

+2 −5
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ void rtw_fw_beacon_filter_config(struct rtw_dev *rtwdev, bool connect, 
	s32 threshold = bss_conf->cqm_rssi_thold + rssi_offset;

	u8 h2c_pkt[H2C_PKT_SIZE] = {0};



	if (!rtw_fw_feature_check(&rtwdev->fw, FW_FEATURE_BCN_FILTER))

	if (!rtw_fw_feature_check(&rtwdev->fw, FW_FEATURE_BCN_FILTER) || !si)

		return;



	if (!connect) {
@@ -623,10 +623,7 @@ void rtw_fw_beacon_filter_config(struct rtw_dev *rtwdev, bool connect, 
					       BCN_FILTER_OFFLOAD_MODE_DEFAULT);

	SET_BCN_FILTER_OFFLOAD_P1_THRESHOLD(h2c_pkt, (u8)threshold);

	SET_BCN_FILTER_OFFLOAD_P1_BCN_LOSS_CNT(h2c_pkt, BCN_LOSS_CNT);

	if (si)

	SET_BCN_FILTER_OFFLOAD_P1_MACID(h2c_pkt, si->mac_id);

	else

		rtw_warn(rtwdev, "CQM config with station not found\n");

	SET_BCN_FILTER_OFFLOAD_P1_HYST(h2c_pkt, bss_conf->cqm_rssi_hyst);

	SET_BCN_FILTER_OFFLOAD_P1_BCN_INTERVAL(h2c_pkt, bss_conf->beacon_int);

	rtw_fw_send_h2c_command(rtwdev, h2c_pkt);