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

rtl8188eu: Remove dead code associated with WAPI

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-12 01:29:15 -05:00
parent 7c593a903d
commit acda213bd2
16 changed files with 5 additions and 841 deletions
Download patch file Download diff file Expand all files Collapse all files

44
core/rtw_ieee80211.c
View file

@ -755,50 +755,6 @@ int rtw_parse_wpa2_ie(u8* rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi
}
#ifdef CONFIG_WAPI_SUPPORT
int rtw_get_wapi_ie(u8 *in_ie,uint in_len,u8 *wapi_ie,u16 *wapi_len)
{
u8 authmode, i;
uint cnt;
u8 wapi_oui1[4]={0x0,0x14,0x72,0x01};
u8 wapi_oui2[4]={0x0,0x14,0x72,0x02};
_func_enter_;
cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_);
while (cnt<in_len)
{
authmode=in_ie[cnt];
/* if (authmode==_WAPI_IE_) */
if (authmode==_WAPI_IE_ && (_rtw_memcmp(&in_ie[cnt+6], wapi_oui1,4)==true ||
_rtw_memcmp(&in_ie[cnt+6], wapi_oui2,4)==true))
{
if (wapi_ie) {
_rtw_memcpy(wapi_ie, &in_ie[cnt],in_ie[cnt+1]+2);
for (i=0;i<(in_ie[cnt+1]+2);i=i+8){
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\n %2x,%2x,%2x,%2x,%2x,%2x,%2x,%2x\n",
wapi_ie[i],wapi_ie[i+1],wapi_ie[i+2],wapi_ie[i+3],wapi_ie[i+4],
wapi_ie[i+5],wapi_ie[i+6],wapi_ie[i+7]));
}
}
*wapi_len=in_ie[cnt+1]+2;
cnt+=in_ie[cnt+1]+2; /* get next */
}
else
{
cnt+=in_ie[cnt+1]+2; /* get next */
}
}
return *wapi_len;
_func_exit_;
}
#endif
int rtw_get_sec_ie(u8 *in_ie,uint in_len,u8 *rsn_ie,u16 *rsn_len,u8 *wpa_ie,u16 *wpa_len)
{
u8 authmode, sec_idx, i;

5
core/rtw_ioctl_set.c
View file

@ -609,11 +609,6 @@ _func_enter_;
if (psecuritypriv->ndisauthtype>3)
psecuritypriv->dot11AuthAlgrthm=dot11AuthAlgrthm_8021X;
#ifdef CONFIG_WAPI_SUPPORT
if (psecuritypriv->ndisauthtype == 6)
psecuritypriv->dot11AuthAlgrthm=dot11AuthAlgrthm_WAPI;
#endif
res=rtw_set_auth(padapter,psecuritypriv);
if (res==_SUCCESS)

18
core/rtw_mlme.c
View file

@ -1327,20 +1327,6 @@ _func_enter_;
_clr_fwstate_(pmlmepriv, _FW_LINKED);
#endif
#ifdef CONFIG_WAPI_SUPPORT
psta = rtw_get_stainfo(pstapriv,cur_network->MacAddress);
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
{
rtw_wapi_return_one_sta_info(padapter, psta->hwaddr);
}
else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ||
check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
{
rtw_wapi_return_all_sta_info(padapter);
}
#endif
if (check_fwstate(&padapter->mlmepriv, _FW_LINKED)
#ifdef CONFIG_LAYER2_ROAMING
|| (pmlmepriv->to_roaming<=0)
@ -3187,10 +3173,6 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
pmlmepriv->assoc_by_bssid = false;
#ifdef CONFIG_WAPI_SUPPORT
rtw_wapi_return_all_sta_info(padapter);
#endif
while (1) {
if ( _SUCCESS==(do_join_r=rtw_do_join(padapter)) ) {
break;

24
core/rtw_mlme_ext.c
View file

@ -1962,11 +1962,6 @@ unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame)
}
#endif
break;
#ifdef CONFIG_WAPI_SUPPORT
case _WAPI_IE_:
pWapiIE = pIE;
break;
#endif
case _HT_CAPABILITY_IE_: /* HT caps */
HT_caps_handler(padapter, pIE);
break;
@ -1982,10 +1977,6 @@ unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame)
i += (pIE->Length + 2);
}
#ifdef CONFIG_WAPI_SUPPORT
rtw_wapi_on_assoc_ok(padapter, pIE);
#endif
pmlmeinfo->state &= (~WIFI_FW_ASSOC_STATE);
pmlmeinfo->state |= WIFI_FW_ASSOC_SUCCESS;
@ -6820,10 +6811,6 @@ void issue_assocreq(_adapter *padapter)
if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_REALTEK)
pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 6 , REALTEK_96B_IE, &(pattrib->pktlen));
#ifdef CONFIG_WAPI_SUPPORT
rtw_build_assoc_req_wapi_ie(padapter, pframe, pattrib);
#endif
#ifdef CONFIG_P2P
#ifdef CONFIG_IOCTL_CFG80211
@ -8422,13 +8409,6 @@ void start_clnt_join(_adapter* padapter)
val8 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X)? 0xcc: 0xcf;
#ifdef CONFIG_WAPI_SUPPORT
if (padapter->wapiInfo.bWapiEnable && pmlmeinfo->auth_algo == dot11AuthAlgrthm_WAPI)
{
/* Disable TxUseDefaultKey, RxUseDefaultKey, RxBroadcastUseDefaultKey. */
val8 = 0x4c;
}
#endif
rtw_hal_set_hwreg(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8));
/* switch channel */
@ -9852,10 +9832,6 @@ u8 join_cmd_hdl(_adapter *padapter, u8 *pbuf)
rtw_antenna_select_cmd(padapter, pparm->network.PhyInfo.Optimum_antenna, false);
#endif
#ifdef CONFIG_WAPI_SUPPORT
rtw_wapi_clear_all_cam_entry(padapter);
#endif
rtw_joinbss_reset(padapter);
pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20;

58
core/rtw_recv.c
View file

@ -605,13 +605,8 @@ _func_enter_;
case _AES_:
res = rtw_aes_decrypt(padapter, (u8 * )precv_frame);
break;
#ifdef CONFIG_WAPI_SUPPORT
case _SMS4_:
rtw_sms4_decrypt(padapter, (u8 * )precv_frame);
break;
#endif
default:
break;
break;
}
}
else if (prxattrib->bdecrypted==1
@ -1688,14 +1683,6 @@ sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame)
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
#endif
#ifdef CONFIG_WAPI_SUPPORT
PRT_WAPI_T pWapiInfo = &adapter->wapiInfo;
struct recv_frame_hdr *phdr = &precv_frame->u.hdr;
u8 wai_pkt = 0;
u16 sc;
u8 external_len = 0;
#endif
_func_enter_;
@ -1727,9 +1714,6 @@ _func_enter_;
pattrib->mdata = GetMData(ptr);
pattrib->privacy = GetPrivacy(ptr);
pattrib->order = GetOrder(ptr);
#ifdef CONFIG_WAPI_SUPPORT
sc = (pattrib->seq_num<<4) | pattrib->frag_num;
#endif
#if 1 /* Dump rx packets */
{
@ -1787,45 +1771,11 @@ _func_enter_;
retval = _FAIL; /* only data frame return _SUCCESS */
break;
case WIFI_DATA_TYPE: /* data */
#ifdef CONFIG_WAPI_SUPPORT
if (pattrib->qos)
external_len = 2;
else
external_len= 0;
wai_pkt = rtw_wapi_is_wai_packet(adapter,ptr);
phdr->bIsWaiPacket = wai_pkt;
if (wai_pkt !=0){
if (sc != adapter->wapiInfo.wapiSeqnumAndFragNum)
{
adapter->wapiInfo.wapiSeqnumAndFragNum = sc;
}
else
{
retval = _FAIL;
break;
}
}
else{
if (rtw_wapi_drop_for_key_absent(adapter,GetAddr2Ptr(ptr))){
retval=_FAIL;
WAPI_TRACE(WAPI_RX,"drop for key absent for rx\n");
break;
}
}
#endif
rtw_led_control(adapter, LED_CTL_RX);
pattrib->qos = (subtype & BIT(7))? 1:0;
retval = validate_recv_data_frame(adapter, precv_frame);
if (retval == _FAIL)
{
if (retval == _FAIL) {
struct recv_priv *precvpriv = &adapter->recvpriv;
/* RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_data_frame fail\n")); */
precvpriv->rx_drop++;
}
break;
@ -2931,10 +2881,6 @@ static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
count_rx_stats(padapter, prframe, NULL);
#ifdef CONFIG_WAPI_SUPPORT
rtw_wapi_update_info(padapter, prframe);
#endif
#ifdef CONFIG_80211N_HT
ret = process_recv_indicatepkts(padapter, prframe);
if (ret != _SUCCESS)

45
core/rtw_xmit.c
View file

@ -634,14 +634,8 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
#ifdef CONFIG_LPS
/* If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */
#ifdef CONFIG_WAPI_SUPPORT
if ( (pattrib->ether_type == 0x88B4) || (pattrib->ether_type == 0x0806) || (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1) )
#else
if ( (pattrib->ether_type == 0x0806) || (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1) )
#endif
{
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SPECIAL_PACKET, 1);
}
#endif
bmcast = IS_MCAST(pattrib->ra);
@ -729,11 +723,6 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
{
GET_ENCRY_ALGO(psecuritypriv, psta, pattrib->encrypt, bmcast);
#ifdef CONFIG_WAPI_SUPPORT
if (pattrib->ether_type == 0x88B4)
pattrib->encrypt=_NO_PRIVACY_;
#endif
switch (psecuritypriv->dot11AuthAlgrthm)
{
case dot11AuthAlgrthm_Open:
@ -783,14 +772,6 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
pattrib->iv_len = 8;
pattrib->icv_len = 8;
break;
#ifdef CONFIG_WAPI_SUPPORT
case _SMS4_:
pattrib->iv_len = 18;
pattrib->icv_len = 16;
break;
#endif
default:
pattrib->iv_len = 0;
pattrib->icv_len = 0;
@ -813,11 +794,6 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("update_attrib: bswenc=false\n"));
}
#ifdef CONFIG_WAPI_SUPPORT
if (pattrib->encrypt == _SMS4_)
pattrib->bswenc = false;
#endif
rtw_set_tx_chksum_offload(pkt, pattrib);
update_attrib_phy_info(pattrib, psta);
@ -988,12 +964,8 @@ _func_enter_;
case _AES_:
rtw_aes_encrypt(padapter, (u8 * )pxmitframe);
break;
#ifdef CONFIG_WAPI_SUPPORT
case _SMS4_:
rtw_sms4_encrypt(padapter, (u8 * )pxmitframe);
#endif
default:
break;
break;
}
} else {
@ -1331,11 +1303,6 @@ _func_enter_;
else
AES_IV(pattrib->iv, psta->dot11txpn, 0);
break;
#ifdef CONFIG_WAPI_SUPPORT
case _SMS4_:
rtw_wapi_get_iv(padapter,pattrib->ra,pattrib->iv);
break;
#endif
}
}
@ -2456,16 +2423,6 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
res = update_attrib(padapter, *ppkt, &pxmitframe->attrib);
#ifdef CONFIG_WAPI_SUPPORT
if (pxmitframe->attrib.ether_type != 0x88B4)
{
if (rtw_wapi_drop_for_key_absent(padapter, pxmitframe->attrib.ra))
{
WAPI_TRACE(WAPI_RX,"drop for key absend when tx\n");
res = _FAIL;
}
}
#endif
if (res == _FAIL) {
RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: update attrib fail\n"));
#ifdef DBG_TX_DROP_FRAME