rtlwifi: Add ap_num field for btcoexist

If there are many AP (dirty environment), we use another strategy set
to resolve coex issue.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Yan-Hsuan Chuang <yhchuang@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
index ffa7a517b665e604bc04e2a0008596c7cd3676e1..9dbb35f190d1d94ded6eec7fa9e47b8c768692c3 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -503,10 +503,7 @@ static bool halbtc_get(void *void_btcoexist, u8 get_type, void *out_buf)
                ret = false;
                break;
        case BTC_GET_U1_AP_NUM:
-               /* driver do not know AP num,
-                * so the return value here is not right
-                */
-               *u8_tmp = 1;
+               *u8_tmp = rtlpriv->btcoexist.btc_info.ap_num;
                break;
        case BTC_GET_U1_ANT_TYPE:
                *u8_tmp = (u8)BTC_ANT_TYPE_0;

diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c
index df5f6795f65090dafa6df8c6bdcc666c81d9af33..a3997da72ed392d025fc2ea88f5ce4cc240b7345 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/pci.c
+++ b/drivers/net/wireless/realtek/rtlwifi/pci.c
@@ -1824,6 +1824,7 @@ static int rtl_pci_start(struct ieee80211_hw *hw)
        rtlpci->driver_is_goingto_unload = false;
        if (rtlpriv->cfg->ops->get_btc_status &&
            rtlpriv->cfg->ops->get_btc_status()) {
+               rtlpriv->btcoexist.btc_info.ap_num = 36;
                rtlpriv->btcoexist.btc_ops->btc_init_variables(rtlpriv);
                rtlpriv->btcoexist.btc_ops->btc_init_hal_vars(rtlpriv);
        }

diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index 49c0d222927460316ec33837b9a2f56f2004519f..2fb83a7061dd2ee70fc94eec458dab48e74e790f 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -2481,6 +2481,8 @@ struct rtl_btc_info {
        u8 btcoexist;
        u8 ant_num;
        u8 single_ant_path;
+
+       u8 ap_num;
 };
 
 struct bt_coexist_info {