diff options
author | Ping-Ke Shih <pkshih@realtek.com> | 2018-03-05 20:25:44 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2018-03-27 04:54:44 -0400 |
commit | 123068f2eb30ad4e05dc9d0732d8cc05a82e6983 (patch) | |
tree | e0bdd3c06b1ad68a6b749c49c504447c48865926 | |
parent | a1ee1a09cbba06a5927030df466536d556914e0e (diff) |
rtlwifi: btcoex: Get status of multichannel concurrence
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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 8 |
2 files changed, 11 insertions, 0 deletions
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) | |||
577 | tmp = true; | 577 | tmp = true; |
578 | *bool_tmp = tmp; | 578 | *bool_tmp = tmp; |
579 | break; | 579 | break; |
580 | case BTC_GET_BL_WIFI_DUAL_BAND_CONNECTED: | ||
581 | *u8_tmp = BTC_MULTIPORT_SCC; | ||
582 | break; | ||
580 | case BTC_GET_BL_WIFI_BUSY: | 583 | case BTC_GET_BL_WIFI_BUSY: |
581 | if (halbtc_is_wifi_busy(rtlpriv)) | 584 | if (halbtc_is_wifi_busy(rtlpriv)) |
582 | *bool_tmp = true; | 585 | *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 { | |||
251 | BTC_GET_BL_HS_OPERATION, | 251 | BTC_GET_BL_HS_OPERATION, |
252 | BTC_GET_BL_HS_CONNECTING, | 252 | BTC_GET_BL_HS_CONNECTING, |
253 | BTC_GET_BL_WIFI_CONNECTED, | 253 | BTC_GET_BL_WIFI_CONNECTED, |
254 | BTC_GET_BL_WIFI_DUAL_BAND_CONNECTED, | ||
254 | BTC_GET_BL_WIFI_BUSY, | 255 | BTC_GET_BL_WIFI_BUSY, |
255 | BTC_GET_BL_WIFI_SCAN, | 256 | BTC_GET_BL_WIFI_SCAN, |
256 | BTC_GET_BL_WIFI_LINK, | 257 | BTC_GET_BL_WIFI_LINK, |
@@ -436,6 +437,13 @@ enum btc_notify_type_stack_operation { | |||
436 | BTC_STACK_OP_MAX | 437 | BTC_STACK_OP_MAX |
437 | }; | 438 | }; |
438 | 439 | ||
440 | enum { | ||
441 | BTC_MULTIPORT_SCC, | ||
442 | BTC_MULTIPORT_MCC_2CHANNEL, | ||
443 | BTC_MULTIPORT_MCC_2BAND, | ||
444 | BTC_MULTIPORT_MAX | ||
445 | }; | ||
446 | |||
439 | struct btc_bt_info { | 447 | struct btc_bt_info { |
440 | bool bt_disabled; | 448 | bool bt_disabled; |
441 | u8 rssi_adjust_for_agc_table_on; | 449 | u8 rssi_adjust_for_agc_table_on; |