rtlwifi: btcoex: 21a 1ant: re-init coex after wifi leaves IPS
authorYan-Hsuan Chuang <yhchuang@realtek.com>
Thu, 11 May 2017 23:24:38 +0000 (18:24 -0500)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 18 May 2017 14:08:28 +0000 (17:08 +0300)
Before entering IPS, set the PTA control to default value and re-init it
after it leaves IPS to avoid running some redundant code in
run_coexist_mechanism.

Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Pkshih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c

index ab6530cfb653fa4aa098d27aa8fe6afa1de547ef..84cc0bcc5f802daff8331e2a24d49e3eb2952ae7 100644 (file)
@@ -2473,7 +2473,7 @@ void ex_btc8821a1ant_ips_notify(struct btc_coexist *btcoexist, u8 type)
                btc8821a1ant_set_ant_path(btcoexist,
                                          BTC_ANT_PATH_BT, false, true);
                /* set PTA control */
-               btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);
+               btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);
                btc8821a1ant_coex_table_with_type(btcoexist,
                                                  NORMAL_EXEC, 0);
        } else if (BTC_IPS_LEAVE == type) {
@@ -2481,7 +2481,9 @@ void ex_btc8821a1ant_ips_notify(struct btc_coexist *btcoexist, u8 type)
                         "[BTCoex], IPS LEAVE notify\n");
                coex_sta->under_ips = false;
 
-               btc8821a1ant_run_coexist_mechanism(btcoexist);
+               btc8821a1ant_init_hw_config(btcoexist, false, false);
+               btc8821a1ant_init_coex_dm(btcoexist);
+               btc8821a1ant_query_bt_info(btcoexist);
        }
 }