From 387ba28bf9190554b2c3075c580e56bd64987e8a Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 19 Jul 2013 16:41:41 -0500 Subject: [PATCH] rtl8188eu: Remove CONFIG_DISABLE_MCS13TO15 This variable is not selected. Signed-off-by: Larry Finger --- core/rtw_mlme.c | 21 +-------------------- core/rtw_mlme_ext.c | 7 ------- core/rtw_wlan_util.c | 15 ++------------- 3 files changed, 3 insertions(+), 40 deletions(-) diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 586d106..92b0369 100644 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -36,12 +36,7 @@ extern void indicate_wx_scan_complete_event(_adapter *padapter); extern u8 rtw_do_join(_adapter * padapter); -#ifdef CONFIG_DISABLE_MCS13TO15 -extern unsigned char MCS_rate_2R_MCS13TO15_OFF[16]; extern unsigned char MCS_rate_2R[16]; -#else /* CONFIG_DISABLE_MCS13TO15 */ -extern unsigned char MCS_rate_2R[16]; -#endif /* CONFIG_DISABLE_MCS13TO15 */ extern unsigned char MCS_rate_1R[16]; sint _rtw_init_mlme_priv (_adapter* padapter) @@ -2967,25 +2962,11 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len) padapter->HalFunc.GetHwRegHandler(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); /* update the MCS rates */ - for (i = 0; i < 16; i++) - { + for (i = 0; i < 16; i++) { if ((rf_type == RF_1T1R) || (rf_type == RF_1T2R)) - { pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; - } else - { - #ifdef CONFIG_DISABLE_MCS13TO15 - if (pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40 && pregistrypriv->wifi_spec != 1 ) - { - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R_MCS13TO15_OFF[i]; - } - else - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; - #else pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; - #endif /* CONFIG_DISABLE_MCS13TO15 */ - } #ifdef RTL8192C_RECONFIG_TO_1T1R { pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 0633ea8..bd0d50d 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -6671,14 +6671,7 @@ void issue_assocreq(_adapter *padapter) DBG_88E("declare supporting RX STBC\n"); pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |= cpu_to_le16(0x0200);/* RX STBC two spatial stream */ } - #ifdef CONFIG_DISABLE_MCS13TO15 - if (pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40 && (pregpriv->wifi_spec!=1)) - _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R_MCS13TO15_OFF, 16); - else - _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R, 16); - #else /* CONFIG_DISABLE_MCS13TO15 */ _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R, 16); - #endif /* CONFIG_DISABLE_MCS13TO15 */ break; } #ifdef RTL8192C_RECONFIG_TO_1T1R diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index 696fa2c..6ede433 100644 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -42,9 +42,6 @@ static unsigned char EPIGRAM_OUI[] = {0x00, 0x90, 0x4c}; unsigned char REALTEK_96B_IE[] = {0x00, 0xe0, 0x4c, 0x02, 0x01, 0x20}; extern unsigned char MCS_rate_2R[16]; -#ifdef CONFIG_DISABLE_MCS13TO15 -extern unsigned char MCS_rate_2R_MCS13TO15_OFF[16]; -#endif /* CONFIG_DISABLE_MCS13TO15 */ extern unsigned char MCS_rate_1R[16]; extern unsigned char RTW_WPA_OUI[]; extern unsigned char WPA_TKIP_CIPHER[4]; @@ -995,18 +992,10 @@ void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) /* update the MCS rates */ for (i = 0; i < 16; i++) { - if ((rf_type == RF_1T1R) || (rf_type == RF_1T2R)) { + if ((rf_type == RF_1T1R) || (rf_type == RF_1T2R)) pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; - } else { - #ifdef CONFIG_DISABLE_MCS13TO15 - if (pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40 && (pregistrypriv->wifi_spec!=1)) - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R_MCS13TO15_OFF[i]; - else + else pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; - #else - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; - #endif /* CONFIG_DISABLE_MCS13TO15 */ - } #ifdef RTL8192C_RECONFIG_TO_1T1R pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; #endif