| Message ID | 20180306012554.3108-6-pkshih@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 123068f2eb30ad4e05dc9d0732d8cc05a82e6983 |
| Delegated to: | Kalle Valo |
| Headers | show |
On 03/05/2018 07:25 PM, pkshih@realtek.com wrote: > From: Ping-Ke Shih <pkshih@realtek.com> > > btcoex does different decision according to MCC or SCC status, but > driver is still SCC currently. > > Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> > --- > drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 3 +++ > drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 8 ++++++++ > 2 files changed, 11 insertions(+) > > diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c > index 823694cb4fdb..1a24aed34094 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c > +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c > @@ -577,6 +577,9 @@ static bool halbtc_get(void *void_btcoexist, u8 get_type, void *out_buf) > tmp = true; > *bool_tmp = tmp; > break; > + case BTC_GET_BL_WIFI_DUAL_BAND_CONNECTED: > + *u8_tmp = BTC_MULTIPORT_SCC; > + break; > case BTC_GET_BL_WIFI_BUSY: > if (halbtc_is_wifi_busy(rtlpriv)) > *bool_tmp = true; > diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h > index 3c6a1e8851ec..fe793b787716 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h > +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h > @@ -251,6 +251,7 @@ enum btc_get_type { > BTC_GET_BL_HS_OPERATION, > BTC_GET_BL_HS_CONNECTING, > BTC_GET_BL_WIFI_CONNECTED, > + BTC_GET_BL_WIFI_DUAL_BAND_CONNECTED, > BTC_GET_BL_WIFI_BUSY, > BTC_GET_BL_WIFI_SCAN, > BTC_GET_BL_WIFI_LINK, > @@ -436,6 +437,13 @@ enum btc_notify_type_stack_operation { > BTC_STACK_OP_MAX > }; > > +enum { > + BTC_MULTIPORT_SCC, > + BTC_MULTIPORT_MCC_2CHANNEL, > + BTC_MULTIPORT_MCC_2BAND, > + BTC_MULTIPORT_MAX > +}; > + > struct btc_bt_info { > bool bt_disabled; > u8 rssi_adjust_for_agc_table_on; >
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c index 823694cb4fdb..1a24aed34094 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c @@ -577,6 +577,9 @@ static bool halbtc_get(void *void_btcoexist, u8 get_type, void *out_buf) tmp = true; *bool_tmp = tmp; break; + case BTC_GET_BL_WIFI_DUAL_BAND_CONNECTED: + *u8_tmp = BTC_MULTIPORT_SCC; + break; case BTC_GET_BL_WIFI_BUSY: if (halbtc_is_wifi_busy(rtlpriv)) *bool_tmp = true; diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h index 3c6a1e8851ec..fe793b787716 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h @@ -251,6 +251,7 @@ enum btc_get_type { BTC_GET_BL_HS_OPERATION, BTC_GET_BL_HS_CONNECTING, BTC_GET_BL_WIFI_CONNECTED, + BTC_GET_BL_WIFI_DUAL_BAND_CONNECTED, BTC_GET_BL_WIFI_BUSY, BTC_GET_BL_WIFI_SCAN, BTC_GET_BL_WIFI_LINK, @@ -436,6 +437,13 @@ enum btc_notify_type_stack_operation { BTC_STACK_OP_MAX }; +enum { + BTC_MULTIPORT_SCC, + BTC_MULTIPORT_MCC_2CHANNEL, + BTC_MULTIPORT_MCC_2BAND, + BTC_MULTIPORT_MAX +}; + struct btc_bt_info { bool bt_disabled; u8 rssi_adjust_for_agc_table_on;