Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19afb922 authored by Yan-Hsuan Chuang's avatar Yan-Hsuan Chuang Committed by Kalle Valo
Browse files

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: default avatarYan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: default avatarLarry 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: default avatarKalle Valo <kvalo@codeaurora.org>
parent bcdffd05

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c

+11 −13
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.h

+1 −0
Original line number Diff line number Diff line
@@ -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;