skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-06 21:43:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove tests on macro CONFIG_80211N_HT

Browse source 
This one is always selected.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2018-11-12 14:06:58 -06:00
parent e9184bd34c
commit e3e242b712
28 changed files with 46 additions and 428 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/rtw_tdls.c
View file

@ -316,7 +316,6 @@ void rtw_tdls_set_key(_adapter *padapter, struct sta_info *ptdls_sta)
rtw_setstakey_cmd(padapter, ptdls_sta, TDLS_KEY, _TRUE);
}
#ifdef CONFIG_80211N_HT
void rtw_tdls_process_ht_cap(_adapter *padapter, struct sta_info *ptdls_sta, u8 *data, u8 Length)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -419,7 +418,6 @@ u8 *rtw_tdls_set_ht_cap(_adapter *padapter, u8 *pframe, struct pkt_attrib *pattr
return pframe + pattrib->pktlen;
}
#endif
u8 *rtw_tdls_set_sup_ch(struct mlme_ext_priv *pmlmeext, u8 *pframe, struct pkt_attrib *pattrib)
{
@ -1619,11 +1617,9 @@ sint On_TDLS_Setup_Req(_adapter *padapter, union recv_frame *precv_frame)
break;
case _RIC_Descriptor_IE_:
break;
#ifdef CONFIG_80211N_HT
case _HT_CAPABILITY_IE_:
rtw_tdls_process_ht_cap(padapter, ptdls_sta, pIE->data, pIE->Length);
break;
#endif
case EID_BSSCoexistence:
break;
case _LINK_ID_IE_:
@ -1799,11 +1795,9 @@ int On_TDLS_Setup_Rsp(_adapter *padapter, union recv_frame *precv_frame)
break;
case _RIC_Descriptor_IE_:
break;
#ifdef CONFIG_80211N_HT
case _HT_CAPABILITY_IE_:
rtw_tdls_process_ht_cap(padapter, ptdls_sta, pIE->data, pIE->Length);
break;
#endif
case EID_BSSCoexistence:
break;
case _LINK_ID_IE_:
@ -1943,10 +1937,8 @@ int On_TDLS_Setup_Cfm(_adapter *padapter, union recv_frame *precv_frame)
case _TIMEOUT_ITVL_IE_:
ptimeout_ie = (u8 *)pIE;
break;
#ifdef CONFIG_80211N_HT
case _HT_EXTRA_INFO_IE_:
break;
#endif
case _LINK_ID_IE_:
plinkid_ie = (u8 *)pIE;
break;
@ -2536,11 +2528,9 @@ void rtw_build_tdls_setup_req_ies(_adapter *padapter, struct xmit_frame *pxmitfr
pframe = rtw_tdls_set_timeout_interval(ptxmgmt, pframe, pattrib, _TRUE, ptdls_sta);
}
#ifdef CONFIG_80211N_HT
/* Sup_reg_classes(optional) */
if (pregistrypriv->ht_enable == _TRUE)
pframe = rtw_tdls_set_ht_cap(padapter, pframe_head, pattrib);
#endif
pframe = rtw_tdls_set_bss_coexist(padapter, pframe, pattrib);
@ -2620,11 +2610,9 @@ void rtw_build_tdls_setup_rsp_ies(_adapter *padapter, struct xmit_frame *pxmitfr
pframe = rtw_tdls_set_timeout_interval(ptxmgmt, pframe, pattrib, _FALSE, ptdls_sta);
}
#ifdef CONFIG_80211N_HT
/* Sup_reg_classes(optional) */
if (pregistrypriv->ht_enable == _TRUE)
pframe = rtw_tdls_set_ht_cap(padapter, pframe_head, pattrib);
#endif
pframe = rtw_tdls_set_bss_coexist(padapter, pframe, pattrib);
@ -2775,17 +2763,13 @@ void rtw_build_tdls_dis_rsp_ies(_adapter *padapter, struct xmit_frame *pxmitfram
pframe = rtw_tdls_set_timeout_interval(ptxmgmt, pframe, pattrib, _TRUE, NULL);
}
#ifdef CONFIG_80211N_HT
if (pregistrypriv->ht_enable == _TRUE)
pframe = rtw_tdls_set_ht_cap(padapter, pframe_head - pktlen_index, pattrib);
#endif
pframe = rtw_tdls_set_bss_coexist(padapter, pframe, pattrib);
pframe = rtw_tdls_set_linkid(pframe, pattrib, _FALSE);
}
void rtw_build_tdls_peer_traffic_indication_ies(_adapter *padapter, struct xmit_frame *pxmitframe, u8 *pframe, struct tdls_txmgmt *ptxmgmt)
{