skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-25 14:03:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_DISABLE_MCS13TO15

Browse source 
This variable is not selected.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-19 16:41:41 -05:00
parent 55d4e504a2
commit 387ba28bf9
3 changed files with 3 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/rtw_mlme.c
View file

@ -36,12 +36,7 @@
extern void indicate_wx_scan_complete_event(_adapter *padapter); extern void indicate_wx_scan_complete_event(_adapter *padapter);
extern u8 rtw_do_join(_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]; 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]; extern unsigned char MCS_rate_1R[16];
sint _rtw_init_mlme_priv (_adapter* padapter) 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)); padapter->HalFunc.GetHwRegHandler(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));
/* update the MCS rates */ /* 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)) if ((rf_type == RF_1T1R) || (rf_type == RF_1T2R))
{
pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i];
}
else 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]; pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i];
#endif /* CONFIG_DISABLE_MCS13TO15 */
}
#ifdef RTL8192C_RECONFIG_TO_1T1R #ifdef RTL8192C_RECONFIG_TO_1T1R
{ {
pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i];

7
core/rtw_mlme_ext.c
View file

@ -6671,14 +6671,7 @@ void issue_assocreq(_adapter *padapter)
DBG_88E("declare supporting RX STBC\n"); 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 */ 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); _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R, 16);
#endif /* CONFIG_DISABLE_MCS13TO15 */
break; break;
} }
#ifdef RTL8192C_RECONFIG_TO_1T1R #ifdef RTL8192C_RECONFIG_TO_1T1R

15
core/rtw_wlan_util.c
View file

@ -42,9 +42,6 @@ static unsigned char EPIGRAM_OUI[] = {0x00, 0x90, 0x4c};
unsigned char REALTEK_96B_IE[] = {0x00, 0xe0, 0x4c, 0x02, 0x01, 0x20}; unsigned char REALTEK_96B_IE[] = {0x00, 0xe0, 0x4c, 0x02, 0x01, 0x20};
extern unsigned char MCS_rate_2R[16]; 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 MCS_rate_1R[16];
extern unsigned char RTW_WPA_OUI[]; extern unsigned char RTW_WPA_OUI[];
extern unsigned char WPA_TKIP_CIPHER[4]; 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 */ /* 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)) { if ((rf_type == RF_1T1R) || (rf_type == RF_1T2R))
pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i];
} else { 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]; 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 #ifdef RTL8192C_RECONFIG_TO_1T1R
pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i];
#endif #endif