Commit 66d0f9de authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtlwifi: btcoex: extend get_wifi_bw to support bandwidth 80M 



The rtlwifi newer ICs support 80M bandwidth in 5G band, so extend
get_wifi_bw() to know bandwidth 80M that helps btcoex to make correct
decisions.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent ba9797b2

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

+15 −22
Original line number Diff line number Diff line
@@ -95,21 +95,6 @@ static bool is_any_client_connect_to_ap(struct btc_coexist *btcoexist) 
		return false;

}



static bool halbtc_is_bt40(struct rtl_priv *adapter)

{

	struct rtl_priv *rtlpriv = adapter;

	struct rtl_phy *rtlphy = &(rtlpriv->phy);

	bool is_ht40 = true;

	enum ht_channel_width bw = rtlphy->current_chan_bw;



	if (bw == HT_CHANNEL_WIDTH_20)

		is_ht40 = false;

	else if (bw == HT_CHANNEL_WIDTH_20_40)

		is_ht40 = true;



	return is_ht40;

}



static bool halbtc_legacy(struct rtl_priv *adapter)

{

	struct rtl_priv *rtlpriv = adapter;
@@ -135,18 +120,26 @@ bool halbtc_is_wifi_uplink(struct rtl_priv *adapter) 


static u32 halbtc_get_wifi_bw(struct btc_coexist *btcoexist)

{

	struct rtl_priv *rtlpriv =

		(struct rtl_priv *)btcoexist->adapter;

	struct rtl_priv *rtlpriv = btcoexist->adapter;

	struct rtl_phy *rtlphy = &rtlpriv->phy;

	u32 wifi_bw = BTC_WIFI_BW_HT20;



	if (halbtc_is_bt40(rtlpriv)) {

		wifi_bw = BTC_WIFI_BW_HT40;

	} else {

		if (halbtc_legacy(rtlpriv))

	if (halbtc_legacy(rtlpriv)) {

		wifi_bw = BTC_WIFI_BW_LEGACY;

		else

	} else {

		switch (rtlphy->current_chan_bw) {

		case HT_CHANNEL_WIDTH_20:

			wifi_bw = BTC_WIFI_BW_HT20;

			break;

		case HT_CHANNEL_WIDTH_20_40:

			wifi_bw = BTC_WIFI_BW_HT40;

			break;

		case HT_CHANNEL_WIDTH_80:

			wifi_bw = BTC_WIFI_BW_HT80;

			break;

		}

	}



	return wifi_bw;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ enum btc_wifi_bw_mode { 
	BTC_WIFI_BW_LEGACY = 0x0,

	BTC_WIFI_BW_HT20 = 0x1,

	BTC_WIFI_BW_HT40 = 0x2,

	BTC_WIFI_BW_HT80 = 0x3,

	BTC_WIFI_BW_MAX

};