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

rtl8188eu: Remove CONFIG_WAPI_SUPPORT

Browse source 
This symbol is not defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-02 11:12:58 -06:00
parent 1d52d1060a
commit 4b61fd5bf7
17 changed files with 7 additions and 591 deletions
Download patch file Download diff file Expand all files Collapse all files

47
core/rtw_ieee80211.c
View file

@ -746,61 +746,14 @@ int rtw_parse_wpa2_ie(u8* rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi
}
return ret;
}
#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};
;
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) {
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;
;
}
#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;
u8 wpa_oui[4]={0x0,0x50,0xf2,0x01};
uint cnt;
;
/* Search required WPA or WPA2 IE and copy to sec_ie[ ] */
cnt = (_TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_);

7
core/rtw_ioctl_set.c
View file

@ -657,11 +657,6 @@ u8 rtw_set_802_11_authentication_mode(struct adapter* padapter, NDIS_802_11_AUTH
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)
@ -669,8 +664,6 @@ u8 rtw_set_802_11_authentication_mode(struct adapter* padapter, NDIS_802_11_AUTH
else
ret=false;
;
return ret;
}

17
core/rtw_mlme.c
View file

@ -1397,19 +1397,6 @@ void rtw_indicate_disconnect( struct adapter *padapter )
if(rtw_to_roaming(padapter) > 0)
_clr_fwstate_(pmlmepriv, _FW_LINKED);
#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)
|| (rtw_to_roaming(padapter) <= 0)
)
@ -3191,10 +3178,6 @@ void _rtw_roaming(struct 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;

32
core/rtw_mlme_ext.c
View file

@ -1990,7 +1990,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame)
{
WMM_param_handler(padapter, pIE);
}
#if defined(CONFIG_P2P) && defined(CONFIG_P2P)
#if defined(CONFIG_P2P)
else if ( _rtw_memcmp(pIE->data, WFD_OUI, 4)) /* WFD */
{
DBG_871X( "[%s] Found WFD IE\n", __FUNCTION__ );
@ -1998,13 +1998,6 @@ unsigned int OnAssocRsp(struct 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;
@ -2023,10 +2016,6 @@ unsigned int OnAssocRsp(struct 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;
@ -6949,15 +6938,7 @@ void issue_assocreq(struct 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
@ -8654,13 +8635,6 @@ void start_clnt_join(struct 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));
/* Because of AP's not receiving deauth before */
@ -10107,10 +10081,6 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
rtw_antenna_select_cmd(padapter, pparm->network.PhyInfo.Optimum_antenna, false);
#ifdef CONFIG_WAPI_SUPPORT
rtw_wapi_clear_all_cam_entry(padapter);
#endif
rtw_joinbss_reset(padapter);
pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20;

56
core/rtw_recv.c
View file

@ -613,11 +613,6 @@ static union recv_frame *decryptor(struct adapter *padapter,union recv_frame *pr
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;
}
@ -2021,16 +2016,6 @@ sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
#ifdef CONFIG_TDLS
struct tdls_info *ptdlsinfo = &adapter->tdlsinfo;
#endif /* CONFIG_TDLS */
#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
;
#ifdef CONFIG_AP_MODE
if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) {
@ -2081,11 +2066,7 @@ sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
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 */
{
u8 bDumpRxPkt;
rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt));
@ -2121,7 +2102,6 @@ sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
}
}
}
#endif
switch (type)
{
case WIFI_MGT_TYPE: /* mgnt */
@ -2149,38 +2129,6 @@ sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
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);
@ -3372,10 +3320,6 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr
count_rx_stats(padapter, prframe, NULL);
#endif /* CONFIG_TDLS */
#ifdef CONFIG_WAPI_SUPPORT
rtw_wapi_update_info(padapter, prframe);
#endif
ret = process_recv_indicatepkts(padapter, prframe);
if (ret != _SUCCESS)
{

5
core/rtw_sreset.c
View file

@ -124,11 +124,6 @@ static void sreset_restore_security_station(struct adapter *padapter)
if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X) {
val8 = 0xcc;
#ifdef CONFIG_WAPI_SUPPORT
} else if (padapter->wapiInfo.bWapiEnable && pmlmeinfo->auth_algo == dot11AuthAlgrthm_WAPI) {
/* Disable TxUseDefaultKey, RxUseDefaultKey, RxBroadcastUseDefaultKey. */
val8 = 0x4c;
#endif
} else {
val8 = 0xcf;
}

42
core/rtw_xmit.c
View file

@ -684,14 +684,8 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
}
/* 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);
}
bmcast = IS_MCAST(pattrib->ra);
@ -776,11 +770,6 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
{
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:
@ -830,14 +819,6 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
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;
@ -859,10 +840,6 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
pattrib->bswenc = false;
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);
@ -1035,10 +1012,6 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmi
case _AES_:
rtw_aes_encrypt(padapter, (u8 * )pxmitframe);
break;
#ifdef CONFIG_WAPI_SUPPORT
case _SMS4_:
rtw_sms4_encrypt(padapter, (u8 * )pxmitframe);
#endif
default:
break;
}
@ -1742,11 +1715,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_fram
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
}
}
@ -3150,16 +3118,6 @@ s32 rtw_xmit(struct 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