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

rtl8188eu: Remove CONFIG_DISABLE_MCS13TO15

Browse source 
This one is not defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-02 10:39:28 -06:00
parent e5f09bb52b
commit 44ff69caaa
4 changed files with 0 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/rtw_mlme.c
View file

@ -36,12 +36,7 @@
extern void indicate_wx_scan_complete_event(struct adapter *padapter); extern void indicate_wx_scan_complete_event(struct adapter *padapter);
extern u8 rtw_do_join(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]; 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 (struct adapter* padapter) 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 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
{ {

12
core/rtw_mlme_ext.c
View file

@ -98,12 +98,7 @@ unsigned char RSN_TKIP_CIPHER[4] = {0x00, 0x0f, 0xac, 0x02};
/******************************************************** /********************************************************
MCS rate definitions 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}; 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}; 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"); 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 */ 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); 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; break;
} }
#ifdef RTL8192C_RECONFIG_TO_1T1R #ifdef RTL8192C_RECONFIG_TO_1T1R

7
core/rtw_wlan_util.c
View file

@ -1040,14 +1040,7 @@ void HT_caps_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
} }
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
{ {

3
include/osdep_service.h
View file

@ -94,9 +94,6 @@ extern int rtw_ampdu_enable;//for enable tx_ampdu
extern int ui_pid[3]; extern int ui_pid[3];
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];