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

rtlwifi: btcoex: 21a 1ant: treat ARP as special packet 



We need to pay attention to ARP packets to correctly establish
connection, and reset the ARP counter when disconnected.

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 ee406cec

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

+46 −3
Original line number Diff line number Diff line
@@ -2610,6 +2610,18 @@ void ex_btc8821a1ant_connect_notify(struct btc_coexist *btcoexist, u8 type) 
		return;

	}



	if (type == BTC_ASSOCIATE_START) {

		coex_sta->wifi_is_high_pri_task = true;

		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

			 "[BTCoex], CONNECT START notify\n");

		coex_dm->arp_cnt = 0;

	} else {

		coex_sta->wifi_is_high_pri_task = false;

		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

			 "[BTCoex], CONNECT FINISH notify\n");

		coex_dm->arp_cnt = 0;

	}



	btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,

			   &wifi_link_status);

	num_of_wifi_link = wifi_link_status >> 16;
@@ -2675,6 +2687,7 @@ void ex_btc8821a1ant_media_status_notify(struct btc_coexist *btcoexist, 
	} else {

		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

			 "[BTCoex], MEDIA disconnect notify\n");

		coex_dm->arp_cnt = 0;

	}



	/* only 2.4G we need to inform bt the chnl mask */
@@ -2728,6 +2741,24 @@ void ex_btc8821a1ant_special_packet_notify(struct btc_coexist *btcoexist, 
		return;

	}



	if (type == BTC_PACKET_DHCP || type == BTC_PACKET_EAPOL ||

	    type == BTC_PACKET_ARP) {

		coex_sta->wifi_is_high_pri_task = true;



		if (type == BTC_PACKET_ARP) {

			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

				 "[BTCoex], specific Packet ARP notify\n");

		} else {

			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

				 "[BTCoex], specific Packet DHCP or EAPOL notify\n");

		}

	} else {

		coex_sta->wifi_is_high_pri_task = false;

		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

			 "[BTCoex], specific Packet [Type = %d] notify\n",

			 type);

	}



	coex_sta->special_pkt_period_cnt = 0;



	btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,
@@ -2750,8 +2781,20 @@ void ex_btc8821a1ant_special_packet_notify(struct btc_coexist *btcoexist, 
		return;

	}



	if (BTC_PACKET_DHCP == type ||

	    BTC_PACKET_EAPOL == type) {

	if (type == BTC_PACKET_DHCP || type == BTC_PACKET_EAPOL ||

	    type == BTC_PACKET_ARP) {

		if (type == BTC_PACKET_ARP) {

			coex_dm->arp_cnt++;

			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

				 "[BTCoex], ARP Packet Count = %d\n",

				 coex_dm->arp_cnt);

			if (coex_dm->arp_cnt >= 10)

				/* if APR PKT > 10 after connect, do not go to

				 * btc8821a1ant_act_wifi_conn_sp_pkt

				 */

				return;

		}



		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

			 "[BTCoex], special Packet(%d) notify\n", type);

		btc8821a1ant_act_wifi_conn_sp_pkt(btcoexist);

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

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ struct coex_dm_8821a_1ant { 
	u8	cur_retry_limit_type;

	u8	pre_ampdu_time_type;

	u8	cur_ampdu_time_type;

	u32	arp_cnt;



	u8	error_condition;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE