rtlwifi: btcoex: 21a 1ant: move bt_disabled to global struct

Move the bt disable flag to a global structure to indicate that bt is
turned off.

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>

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index 86eab6a4ada2c98b1e5f93e2b1a44b40f7d7f99e..c6114b32c0ca06e8c03a65c753dc88a76b4081c4 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -2168,7 +2168,7 @@ void ex_btc8821a1ant_display_coex_info(struct btc_coexist *btcoexist)
                 "uplink" : "downlink")));
        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
                   "\r\n %-35s = [%s/ %d/ %d] ", "BT [status/ rssi/ retryCnt]",
-                  ((btcoexist->bt_info.bt_disabled) ? ("disabled") :
+                  ((coex_sta->bt_disabled) ? ("disabled") :
                   ((coex_sta->c2h_bt_inquiry_page) ? ("inquiry/page scan") :
                   ((BT_8821A_1ANT_BT_STATUS_NON_CONNECTED_IDLE ==
                     coex_dm->bt_status) ?
@@ -2394,9 +2394,10 @@ void ex_btc8821a1ant_scan_notify(struct btc_coexist *btcoexist, u8 type)
        u32 num_of_wifi_link = 0;
        u8 agg_buf_size = 5;
 
-       if (btcoexist->manual_control ||
-           btcoexist->stop_coex_dm ||
-           btcoexist->bt_info.bt_disabled)
+       if (btcoexist->manual_control || btcoexist->stop_coex_dm)
+               return;
+
+       if (coex_sta->bt_disabled)
                return;
 
        btcoexist->btc_get(btcoexist,
@@ -2456,9 +2457,8 @@ void ex_btc8821a1ant_connect_notify(struct btc_coexist *btcoexist, u8 type)
        bool bt_ctrl_agg_buf_size = false;
        u8 agg_buf_size = 5;
 
-       if (btcoexist->manual_control ||
-           btcoexist->stop_coex_dm ||
-           btcoexist->bt_info.bt_disabled)
+       if (btcoexist->manual_control || btcoexist->stop_coex_dm ||
+           coex_sta->bt_disabled)
                return;
 
        btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,
@@ -2508,9 +2508,8 @@ void ex_btc8821a1ant_media_status_notify(struct btc_coexist *btcoexist,
        u32 wifi_bw;
        u8 wifi_central_chnl;
 
-       if (btcoexist->manual_control ||
-           btcoexist->stop_coex_dm ||
-           btcoexist->bt_info.bt_disabled)
+       if (btcoexist->manual_control || btcoexist->stop_coex_dm ||
+           coex_sta->bt_disabled)
                return;
 
        if (BTC_MEDIA_CONNECT == type) {
@@ -2559,9 +2558,8 @@ void ex_btc8821a1ant_special_packet_notify(struct btc_coexist *btcoexist,
        u32 num_of_wifi_link = 0;
        u8 agg_buf_size = 5;
 
-       if (btcoexist->manual_control ||
-           btcoexist->stop_coex_dm ||
-           btcoexist->bt_info.bt_disabled)
+       if (btcoexist->manual_control || btcoexist->stop_coex_dm ||
+           coex_sta->bt_disabled)
                return;
 
        coex_sta->special_pkt_period_cnt = 0;

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.h
index 9f50a1427388df4876593f9eaf76a0d21f4da0fe..2dec38ab774672d39d7eb3434220701c8094a8c4 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.h
@@ -140,6 +140,7 @@ struct coex_dm_8821a_1ant {
 };
 
 struct coex_sta_8821a_1ant {
+       bool    bt_disabled;
        bool    bt_link_exist;
        bool    sco_exist;
        bool    a2dp_exist;