rtw88: 8821c: apply CCK PD level which calculates from dynamic mechanism

Hal function must follow the value that calculates from dynamic mechanism.
Force to set new_lvl to 4 damages receiving ability. System will not able
to reconnect to the AP if wifi unexpected disconnecting at this moment.

Signed-off-by: Vincent Fann <vincent_fann@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201228082516.16488-1-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
index fbfd85439d1ff5222e69ba0ea8259c64aedc212e..74155c999ebb42b298a2b7abf16f90d7523e110e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
@@ -1022,12 +1022,6 @@ static void rtw8821c_phy_cck_pd_set(struct rtw_dev *rtwdev, u8 new_lvl)
        u8 pd[CCK_PD_LV_MAX] = {3, 7, 13, 13, 13};
        u8 cck_n_rx;
 
-       if (dm_info->min_rssi > 60) {
-               new_lvl = 4;
-               pd[4] = 0x1d;
-               goto set_cck_pd;
-       }
-
        rtw_dbg(rtwdev, RTW_DBG_PHY, "lv: (%d) -> (%d)\n",
                dm_info->cck_pd_lv[RTW_CHANNEL_WIDTH_20][RF_PATH_A], new_lvl);
 
@@ -1044,7 +1038,6 @@ static void rtw8821c_phy_cck_pd_set(struct rtw_dev *rtwdev, u8 new_lvl)
 
        dm_info->cck_fa_avg = CCK_FA_AVG_RESET;
 
-set_cck_pd:
        dm_info->cck_pd_lv[RTW_CHANNEL_WIDTH_20][RF_PATH_A] = new_lvl;
        rtw_write32_mask(rtwdev, REG_PWRTH, 0x3f0000, pd[new_lvl]);
        rtw_write32_mask(rtwdev, REG_PWRTH2, 0x1f0000,