diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index bcaa257..e2f815a 100755 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -36,12 +36,7 @@ extern void indicate_wx_scan_complete_event(struct adapter *padapter); extern u8 rtw_do_join(struct 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 (struct adapter* padapter) @@ -3103,16 +3098,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len) } 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 { diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index b84c082..fdab99e 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -98,12 +98,7 @@ unsigned char RSN_TKIP_CIPHER[4] = {0x00, 0x0f, 0xac, 0x02}; /******************************************************** MCS rate definitions *********************************************************/ -#ifdef CONFIG_DISABLE_MCS13TO15 -unsigned char MCS_rate_2R_MCS13TO15_OFF[16] = {0xff, 0x1f, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; unsigned char MCS_rate_2R[16] = {0xff, 0xff, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; -#else /* CONFIG_DISABLE_MCS13TO15 */ -unsigned char MCS_rate_2R[16] = {0xff, 0xff, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; -#endif /* CONFIG_DISABLE_MCS13TO15 */ unsigned char MCS_rate_1R[16] = {0xff, 0x00, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; /******************************************************** @@ -6966,14 +6961,7 @@ void issue_assocreq(struct adapter *padapter) DBG_871X("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)) - memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R_MCS13TO15_OFF, 16); - else memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R, 16); - #else /* CONFIG_DISABLE_MCS13TO15 */ - 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 f780a3f..6048324 100755 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -1040,14 +1040,7 @@ void HT_caps_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) } 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 { diff --git a/include/osdep_service.h b/include/osdep_service.h index 88d0952..36a96b6 100755 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -94,9 +94,6 @@ extern int rtw_ampdu_enable;//for enable tx_ampdu extern int ui_pid[3]; 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];