staging: r8188eu: use native wireless IE codes from linux/ieee80211.h
PATCH 1/1 staging: r8188eu: use native wireless IE codes from linux/ieee80211.h
IE code definitions have been replaced with native ones to avoid code duplication.
The unobvious substitutions are:
_SSN_IE_1_ -> WLAN_EID_VENDOR_SPECIFIC;
_WPA_IE_ID_ -> WLAN_EID_VENDOR_SPECIFIC;
_WPA2_IE_ID_ -> WLAN_EID_RSN.
Signed-off-by Ivan Safonov <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_ap.c | 54 ++++---- drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +- .../staging/rtl8188eu/core/rtw_ieee80211.c | 36 +++--- .../staging/rtl8188eu/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 18 +-- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 122 +++++++++--------- drivers/staging/rtl8188eu/core/rtw_recv.c | 4 +- .../staging/rtl8188eu/core/rtw_wlan_util.c | 24 ++-- drivers/staging/rtl8188eu/core/rtw_xmit.c | 10 +- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 10 +- .../staging/rtl8188eu/include/rtw_security.h | 3 - drivers/staging/rtl8188eu/include/wifi.h | 34 ----- .../staging/rtl8188eu/os_dep/ioctl_linux.c | 10 +- drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 2 +- 14 files changed, 147 insertions(+), 184 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +27 -27
@@ -67,7 +67,7 @@ static void update_BCNTIM(struct adapter *padapter)uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;/* update TIM IE */ - p =rtw_get_ie (pie + _FIXED_IE_LENGTH_, _TIM_IE_, &tim_ielen, + p =rtw_get_ie (pie + _FIXED_IE_LENGTH_,WLAN_EID_TIM , &tim_ielen, pnetwork_mlmeext->ie_length - _FIXED_IE_LENGTH_);if (p && tim_ielen >0 ) { tim_ielen +=2 ;
@@ -85,7 +85,7 @@ static void update_BCNTIM(struct adapter *padapter) offset += pnetwork_mlmeext->ssid.ssid_length +2 ;/* get supported rates len */ - p =rtw_get_ie (pie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, + p =rtw_get_ie (pie + _BEACON_IE_OFFSET_,WLAN_EID_SUPP_RATES , &tmp_len, (pnetwork_mlmeext->ie_length - _BEACON_IE_OFFSET_));if (p)
@@ -109,7 +109,7 @@ static void update_BCNTIM(struct adapter *padapter)memcpy (pbackup_remainder_ie, premainder_ie, remainder_ielen); } - *dst_ie++ = _TIM_IE_; + *dst_ie++ =WLAN_EID_TIM ;if ((pstapriv->tim_bitmap &0xff00 ) && (pstapriv->tim_bitmap &0x00fc )) tim_ielen =5 ;
@@ -243,7 +243,7 @@ void expire_timeout_chk(struct adapter *padapter)* for this station */ pstapriv->tim_bitmap |=BIT (psta->aid); -update_beacon (padapter, _TIM_IE_,NULL , +update_beacon (padapter,WLAN_EID_TIM ,NULL , false);if (!pmlmeext->active_keep_alive_check)
@@ -671,7 +671,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) }/* set channel, bwmode */ p =rtw_get_ie (pnetwork->ies +sizeof (struct ndis_802_11_fixed_ie ), - _HT_ADD_INFO_IE_, &ie_len, +WLAN_EID_HT_OPERATION , &ie_len, pnetwork->ie_length -sizeof (struct ndis_802_11_fixed_ie ));if (p && ie_len) {
@@ -717,7 +717,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)memcpy (pnetwork_mlmeext, pnetwork, pnetwork->Length);if (pmlmeext->bstart_bss) { -update_beacon (padapter, _TIM_IE_,NULL , false); +update_beacon (padapter,WLAN_EID_TIM ,NULL , false);/* issue beacon frame */ if (send_beacon (padapter) == _FAIL)
@@ -788,7 +788,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) cap =get_unaligned_le16 (ie);/* SSID */ - p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _SSID_IE_, &ie_len, + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_,WLAN_EID_SSID , &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_);if (p && ie_len >0 ) {memset (&pbss_network->ssid,0 ,sizeof (struct ndis_802_11_ssid ));
@@ -799,7 +799,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* channel */ channel =0 ; pbss_network->Configuration.Length =0 ; - p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _DSSET_IE_, &ie_len, + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_,WLAN_EID_DS_PARAMS , &ie_len, (pbss_network->ie_length - _BEACON_IE_OFFSET_));if (p && ie_len >0 ) channel = *(p +2 );
@@ -808,7 +808,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)memset (supportRate,0 ,NDIS_802_11_LENGTH_RATES_EX );/* get supported rates */ - p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &ie_len, + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_,WLAN_EID_SUPP_RATES , &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_);if (p) {memcpy (supportRate, p +2 , ie_len);
@@ -816,7 +816,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) }/* get ext_supported rates */ - p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_, + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_,WLAN_EID_EXT_SUPP_RATES , &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_);if (p) {memcpy (supportRate + supportRateNum, p +2 , ie_len);
@@ -828,7 +828,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)rtw_set_supported_rate (pbss_network->SupportedRates, network_type);/* parsing ERP_IE */ - p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _ERPINFO_IE_, &ie_len, + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_,WLAN_EID_ERP_INFO , &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_);if (p && ie_len >0 )ERP_IE_handler (padapter, (struct ndis_802_11_var_ie *)p);
@@ -846,7 +846,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) pairwise_cipher =0 ; psecuritypriv->wpa2_group_cipher = _NO_PRIVACY_; psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_; - p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len, + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_,WLAN_EID_RSN , &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_);if (p && ie_len >0 ) {if (rtw_parse_wpa2_ie (p, ie_len +2 , &group_cipher, &pairwise_cipher,NULL ) == _SUCCESS) {
@@ -866,7 +866,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) psecuritypriv->wpa_group_cipher = _NO_PRIVACY_; psecuritypriv->wpa_pairwise_cipher = _NO_PRIVACY_;for (p = ie + _BEACON_IE_OFFSET_;; p += (ie_len +2 )) { - p =rtw_get_ie (p, _SSN_IE_1_, &ie_len, + p =rtw_get_ie (p,WLAN_EID_VENDOR_SPECIFIC , &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len +2 ));if ((p) && (!memcmp (p +2 ,OUI1 ,4 ))) { if (rtw_parse_wpa_ie(p, ie_len + 2, &group_cipher,
@@ -891,7 +891,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) pmlmepriv->qospriv.qos_option =0 ;if (pregistrypriv->wmm_enable) {for (p = ie + _BEACON_IE_OFFSET_;; p += (ie_len +2 )) { - p =rtw_get_ie (p, _VENDOR_SPECIFIC_IE_, &ie_len, + p =rtw_get_ie (p,WLAN_EID_VENDOR_SPECIFIC , &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_ - (ie_len +2 ));if ((p) && !memcmp (p +2 ,WMM_PARA_IE ,6 )) { pmlmepriv->qospriv.qos_option =1 ;
@@ -914,7 +914,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) } }/* parsing HT_CAP_IE */ - p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _HT_CAPABILITY_IE_, &ie_len, + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_,WLAN_EID_HT_CAPABILITY , &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_);if (p && ie_len >0 ) {struct ieee80211_ht_cap *pht_cap = (struct ieee80211_ht_cap *)(p +2 );
@@ -938,7 +938,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) }/* parsing HT_INFO_IE */ - p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _HT_ADD_INFO_IE_, &ie_len, + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_,WLAN_EID_HT_OPERATION , &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_);if (p && ie_len >0 ) pHT_info_ie = p;
@@ -1128,7 +1128,7 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)return ;/* parsing ERP_IE */ - p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _ERPINFO_IE_, &len, + p =rtw_get_ie (ie + _BEACON_IE_OFFSET_,WLAN_EID_ERP_INFO , &len, (pnetwork->ie_length - _BEACON_IE_OFFSET_));if (p && len >0 ) {struct ndis_802_11_var_ie *pIE = (struct ndis_802_11_var_ie *)p;
@@ -1227,13 +1227,13 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)spin_lock_bh (&pmlmepriv->bcn_update_lock);switch (ie_id) { -case _TIM_IE_: +case WLAN_EID_TIM :update_BCNTIM (padapter);break ; -case _ERPINFO_IE_: +case WLAN_EID_ERP_INFO :update_bcn_erpinfo_ie (padapter);break ; -case _VENDOR_SPECIFIC_IE_: +case WLAN_EID_VENDOR_SPECIFIC :update_bcn_vendor_spec_ie (padapter, oui);break ;default :
@@ -1394,7 +1394,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)if (pmlmepriv->num_sta_non_erp ==1 ) { beacon_updated = true; -update_beacon (padapter, _ERPINFO_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_ERP_INFO ,NULL , true); } } }else {
@@ -1405,7 +1405,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)if (pmlmepriv->num_sta_non_erp ==0 ) { beacon_updated = true; -update_beacon (padapter, _ERPINFO_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_ERP_INFO ,NULL , true); } } }
@@ -1479,8 +1479,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) }if (rtw_ht_operation_update (padapter) >0 ) { -update_beacon (padapter, _HT_CAPABILITY_IE_,NULL , false); -update_beacon (padapter, _HT_ADD_INFO_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_HT_CAPABILITY ,NULL , false); +update_beacon (padapter,WLAN_EID_HT_OPERATION ,NULL , true); }/* update associated stations cap. */
@@ -1513,7 +1513,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) pmlmepriv->num_sta_non_erp--;if (pmlmepriv->num_sta_non_erp ==0 ) { beacon_updated = true; -update_beacon (padapter, _ERPINFO_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_ERP_INFO ,NULL , true); } }
@@ -1543,8 +1543,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) }if (rtw_ht_operation_update (padapter) >0 ) { -update_beacon (padapter, _HT_CAPABILITY_IE_,NULL , false); -update_beacon (padapter, _HT_ADD_INFO_IE_,NULL , true); +update_beacon (padapter,WLAN_EID_HT_CAPABILITY ,NULL , false); +update_beacon (padapter,WLAN_EID_HT_OPERATION ,NULL , true); }/* update associated stations cap. */
drivers/staging/rtl8188eu/core/rtw_cmd.c +1 -1
@@ -1057,7 +1057,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter) pstapriv->tim_bitmap &= ~BIT (0 ); pstapriv->sta_dz_bitmap &= ~BIT (0 ); -update_beacon (padapter, _TIM_IE_,NULL , false); +update_beacon (padapter,WLAN_EID_TIM ,NULL , false); }else {/* re check again */ rtw_chk_hi_queue_cmd (padapter); }
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +18 -18
@@ -235,7 +235,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) ie +=2 ;/* SSID */ - ie =rtw_set_ie (ie, _SSID_IE_, pdev_network->ssid.ssid_length, pdev_network->ssid.ssid, &sz); + ie =rtw_set_ie (ie,WLAN_EID_SSID , pdev_network->ssid.ssid_length, pdev_network->ssid.ssid, &sz);/* supported rates */ if (pregistrypriv->wireless_mode ==WIRELESS_11ABGN )
@@ -248,21 +248,21 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) rateLen =rtw_get_rateset_len (pdev_network->SupportedRates);if (rateLen >8 ) { - ie =rtw_set_ie (ie, _SUPPORTEDRATES_IE_,8 , pdev_network->SupportedRates, &sz); -/* ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz); */ + ie =rtw_set_ie (ie,WLAN_EID_SUPP_RATES ,8 , pdev_network->SupportedRates, &sz); +/* ie = rtw_set_ie(ie, WLAN_EID_EXT_SUPP_RATES, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz); */ }else { - ie =rtw_set_ie (ie, _SUPPORTEDRATES_IE_, rateLen, pdev_network->SupportedRates, &sz); + ie =rtw_set_ie (ie,WLAN_EID_SUPP_RATES , rateLen, pdev_network->SupportedRates, &sz); }/* DS parameter set */ - ie =rtw_set_ie (ie, _DSSET_IE_,1 , (u8 *)&pdev_network->Configuration.DSConfig, &sz); + ie =rtw_set_ie (ie,WLAN_EID_DS_PARAMS ,1 , (u8 *)&pdev_network->Configuration.DSConfig, &sz);/* IBSS Parameter Set */ - ie =rtw_set_ie (ie, _IBSS_PARA_IE_,2 , (u8 *)&pdev_network->Configuration.ATIMWindow, &sz); + ie =rtw_set_ie (ie,WLAN_EID_IBSS_PARAMS ,2 , (u8 *)&pdev_network->Configuration.ATIMWindow, &sz);if (rateLen >8 ) - ie =rtw_set_ie (ie, _EXT_SUPPORTEDRATES_IE_, (rateLen -8 ), (pdev_network->SupportedRates +8 ), &sz); + ie =rtw_set_ie (ie,WLAN_EID_EXT_SUPP_RATES , (rateLen -8 ), (pdev_network->SupportedRates +8 ), &sz);return sz; }
@@ -277,7 +277,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, uint *wpa_ie_len, int limit)int limit_new = limit;while (1 ) { - pbuf =rtw_get_ie (pbuf, _WPA_IE_ID_, &len, limit_new); + pbuf =rtw_get_ie (pbuf,WLAN_EID_VENDOR_SPECIFIC , &len, limit_new);if (pbuf) {/* check if oui matches... */
@@ -308,7 +308,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, uint *wpa_ie_len, int limit)unsigned char *rtw_get_wpa2_ie (unsigned char *pie,uint *rsn_ie_len,int limit) { -return rtw_get_ie (pie, _WPA2_IE_ID_, rsn_ie_len, limit); +return rtw_get_ie (pie,WLAN_EID_RSN , rsn_ie_len, limit); }int rtw_get_wpa_cipher_suite (u8 *s)
@@ -355,7 +355,7 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwisreturn _FAIL; } -if ((*wpa_ie != _WPA_IE_ID_) || (*(wpa_ie +1 ) != (u8)(wpa_ie_len -2 )) || +if ((*wpa_ie !=WLAN_EID_VENDOR_SPECIFIC ) || (*(wpa_ie +1 ) != (u8)(wpa_ie_len -2 )) || (memcmp (wpa_ie +2 ,RTW_WPA_OUI_TYPE ,WPA_SELECTOR_LEN )))return _FAIL;
@@ -422,7 +422,7 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwireturn _FAIL; } -if ((*rsn_ie != _WPA2_IE_ID_) || (*(rsn_ie +1 ) != (u8)(rsn_ie_len -2 ))) +if ((*rsn_ie !=WLAN_EID_RSN ) || (*(rsn_ie +1 ) != (u8)(rsn_ie_len -2 )))return _FAIL; pos = rsn_ie;
@@ -493,7 +493,7 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_iewhile (cnt < in_len) { authmode = in_ie[cnt]; -if ((authmode == _WPA_IE_ID_) && (!memcmp (&in_ie[cnt +2 ], &wpa_oui[0 ],4 ))) { +if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&in_ie[cnt +2 ], &wpa_oui[0 ],4 ))) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\n rtw_get_wpa_ie: sec_idx =%d in_ie[cnt+1]+2 =%d\n" , sec_idx, in_ie[cnt +1 ] +2 ));
@@ -512,7 +512,7 @@ void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie *wpa_len = in_ie[cnt +1 ] +2 ; cnt += in_ie[cnt +1 ] +2 ;/* get next */ }else { -if (authmode == _WPA2_IE_ID_) { +if (authmode ==WLAN_EID_RSN ) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\n get_rsn_ie: sec_idx =%d in_ie[cnt+1]+2 =%d\n" , sec_idx, in_ie[cnt +1 ] +2 ));
@@ -547,7 +547,7 @@ u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen) eid = ie_ptr[0 ]; -if ((eid == _WPA_IE_ID_) && (!memcmp (&ie_ptr[2 ], wps_oui,4 ))) { +if ((eid ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&ie_ptr[2 ], wps_oui,4 ))) { *wps_ielen = ie_ptr[1 ] +2 ; match = true; }
@@ -580,7 +580,7 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen)while (cnt < in_len) { eid = in_ie[cnt]; -if ((eid == _WPA_IE_ID_) && (!memcmp (&in_ie[cnt +2 ], wps_oui,4 ))) { +if ((eid ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&in_ie[cnt +2 ], wps_oui,4 ))) { wpsie_ptr = &in_ie[cnt];if (wps_ie)
@@ -617,7 +617,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_attif (len_attr) *len_attr =0 ; -if ((wps_ie[0 ] != _VENDOR_SPECIFIC_IE_) || +if ((wps_ie[0 ] !=WLAN_EID_VENDOR_SPECIFIC ) || (memcmp (wps_ie +2 , wps_oui,4 )))return attr_ptr;
@@ -995,7 +995,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork)/* get bwmode and ch_offset */ /* parsing HT_CAP_IE */ - p =rtw_get_ie (pnetwork->network.ies + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_); + p =rtw_get_ie (pnetwork->network.ies + _FIXED_IE_LENGTH_,WLAN_EID_HT_CAPABILITY , &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);if (p && len >0 ) {struct ieee80211_ht_cap *ht_cap = (struct ieee80211_ht_cap *)(p +2 );
@@ -1005,7 +1005,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) pnetwork->BcnInfo.ht_cap_info =0 ; }/* parsing HT_INFO_IE */ - p =rtw_get_ie (pnetwork->network.ies + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_); + p =rtw_get_ie (pnetwork->network.ies + _FIXED_IE_LENGTH_,WLAN_EID_HT_OPERATION , &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);if (p && len >0 ) { pht_info = (struct HT_info_element *)(p +2 ); pnetwork->BcnInfo.ht_info_infos_0 = pht_info->infos[0 ];
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +1 -1
@@ -549,7 +549,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)return 0 ;if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N |WIRELESS_11_5N )) { - p =rtw_get_ie (&pcur_bss->ies[12 ], _HT_CAPABILITY_IE_, + p =rtw_get_ie (&pcur_bss->ies[12 ],WLAN_EID_HT_CAPABILITY , &ht_ielen, pcur_bss->ie_length -12 );if (p && ht_ielen >0 ) {/* cur_bwmod is updated by beacon, pmlmeinfo is updated by association response */
drivers/staging/rtl8188eu/core/rtw_mlme.c +9 -9
@@ -1728,10 +1728,10 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_ ielength =12 ;if ((ndisauthmode == Ndis802_11AuthModeWPA) || (ndisauthmode == Ndis802_11AuthModeWPAPSK)) - authmode = _WPA_IE_ID_; + authmode =WLAN_EID_VENDOR_SPECIFIC ;else if ((ndisauthmode == Ndis802_11AuthModeWPA2) || (ndisauthmode == Ndis802_11AuthModeWPA2PSK)) - authmode = _WPA2_IE_ID_; + authmode =WLAN_EID_RSN ;else authmode =0x0 ;
@@ -1739,7 +1739,7 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_memcpy (out_ie + ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_len); ielength += psecuritypriv->wps_ie_len; - }else if ((authmode == _WPA_IE_ID_) || (authmode == _WPA2_IE_ID_)) { + }else if ((authmode ==WLAN_EID_VENDOR_SPECIFIC ) || (authmode ==WLAN_EID_RSN )) {/* copy RSN or SSN */ memcpy (&out_ie[ielength], &psecuritypriv->supplicant_ie[0 ], psecuritypriv->supplicant_ie[1 ] +2 ); ielength += psecuritypriv->supplicant_ie[1 ] +2 ;
@@ -1747,7 +1747,7 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_ } iEntry =SecIsInPMKIDList (adapter, pmlmepriv->assoc_bssid); -if (iEntry >=0 && authmode == _WPA2_IE_ID_) +if (iEntry >=0 && authmode ==WLAN_EID_RSN ) ielength =rtw_append_pmkid (adapter, iEntry, out_ie, ielength);return ielength;
@@ -1867,14 +1867,14 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ phtpriv->ht_option = false; - p =rtw_get_ie (in_ie +12 , _HT_CAPABILITY_IE_, &ielen, in_len -12 ); + p =rtw_get_ie (in_ie +12 ,WLAN_EID_HT_CAPABILITY , &ielen, in_len -12 );if (p && ielen >0 ) {struct ieee80211_ht_cap ht_cap;if (pqospriv->qos_option ==0 ) { out_len = *pout_len; -rtw_set_ie (out_ie + out_len, _VENDOR_SPECIFIC_IE_, +rtw_set_ie (out_ie + out_len,WLAN_EID_VENDOR_SPECIFIC , _WMM_IE_Length_,WMM_IE , pout_len); pqospriv->qos_option =1 ;
@@ -1906,16 +1906,16 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_else ht_cap.ampdu_params_info |=IEEE80211_HT_AMPDU_PARM_DENSITY &0x00 ; -rtw_set_ie (out_ie + out_len, _HT_CAPABILITY_IE_, +rtw_set_ie (out_ie + out_len,WLAN_EID_HT_CAPABILITY ,sizeof (struct ieee80211_ht_cap ), (unsigned char *)&ht_cap, pout_len); phtpriv->ht_option = true; - p =rtw_get_ie (in_ie +12 , _HT_ADD_INFO_IE_, &ielen, in_len -12 ); + p =rtw_get_ie (in_ie +12 ,WLAN_EID_HT_OPERATION , &ielen, in_len -12 );if (p && (ielen ==sizeof (struct ieee80211_ht_addt_info ))) { out_len = *pout_len; -rtw_set_ie (out_ie + out_len, _HT_ADD_INFO_IE_, ielen, p +2 , pout_len); +rtw_set_ie (out_ie + out_len,WLAN_EID_HT_OPERATION , ielen, p +2 , pout_len); } }return phtpriv->ht_option;
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +61 -61
393 lines not on this page · raw message
drivers/staging/rtl8188eu/core/rtw_recv.c +2 -2
@@ -944,7 +944,7 @@ static int validate_recv_ctrl_frame(struct adapter *padapter,/* update BCN for TIM IE */ /* update_BCNTIM(padapter); */ -update_beacon (padapter, _TIM_IE_,NULL , false); +update_beacon (padapter,WLAN_EID_TIM ,NULL , false); } }else {if (pstapriv->tim_bitmap &BIT (psta->aid)) {
@@ -962,7 +962,7 @@ static int validate_recv_ctrl_frame(struct adapter *padapter,/* update BCN for TIM IE */ /* update_BCNTIM(padapter); */ -update_beacon (padapter, _TIM_IE_,NULL , false); +update_beacon (padapter,WLAN_EID_TIM ,NULL , false); } }
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +12 -12
@@ -831,7 +831,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)/* check bw and channel offset */ /* parsing HT_CAP_IE */ - p =rtw_get_ie (bssid->ies + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, bssid->ie_length - _FIXED_IE_LENGTH_); + p =rtw_get_ie (bssid->ies + _FIXED_IE_LENGTH_,WLAN_EID_HT_CAPABILITY , &len, bssid->ie_length - _FIXED_IE_LENGTH_);if (p && len >0 ) {struct ieee80211_ht_cap *ht_cap = (struct ieee80211_ht_cap *)(p +2 );
@@ -841,7 +841,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) ht_cap_info =0 ; }/* parsing HT_INFO_IE */ - p =rtw_get_ie (bssid->ies + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len, bssid->ie_length - _FIXED_IE_LENGTH_); + p =rtw_get_ie (bssid->ies + _FIXED_IE_LENGTH_,WLAN_EID_HT_OPERATION , &len, bssid->ie_length - _FIXED_IE_LENGTH_);if (p && len >0 ) { pht_info = (struct HT_info_element *)(p +2 ); ht_info_infos_0 = pht_info->infos[0 ];
@@ -863,11 +863,11 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) }/* Checking for channel */ - p =rtw_get_ie (bssid->ies + _FIXED_IE_LENGTH_, _DSSET_IE_, &len, bssid->ie_length - _FIXED_IE_LENGTH_); + p =rtw_get_ie (bssid->ies + _FIXED_IE_LENGTH_,WLAN_EID_DS_PARAMS , &len, bssid->ie_length - _FIXED_IE_LENGTH_);if (p) { bcn_channel = *(p +2 ); }else {/* In 5G, some ap do not have DSSET IE checking HT info for channel */ - p =rtw_get_ie (bssid->ies + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len, bssid->ie_length - _FIXED_IE_LENGTH_); + p =rtw_get_ie (bssid->ies + _FIXED_IE_LENGTH_,WLAN_EID_HT_OPERATION , &len, bssid->ie_length - _FIXED_IE_LENGTH_);if (pht_info) { bcn_channel = pht_info->primary_channel; }else {/* we don't find channel IE, so don't check it */
@@ -883,7 +883,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)/* checking SSID */ ssid_len =0 ; - p =rtw_get_ie (bssid->ies + _FIXED_IE_LENGTH_, _SSID_IE_, &len, bssid->ie_length - _FIXED_IE_LENGTH_); + p =rtw_get_ie (bssid->ies + _FIXED_IE_LENGTH_,WLAN_EID_SSID , &len, bssid->ie_length - _FIXED_IE_LENGTH_);if (p) { ssid_len = *(p +1 );if (ssid_len >NDIS_802_11_LENGTH_SSID )
@@ -994,10 +994,10 @@ void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, stru pIE = (struct ndis_802_11_var_ie *)(pframe + (_BEACON_IE_OFFSET_ +WLAN_HDR_A3_LEN ) + i);switch (pIE->ElementID) { -case _HT_EXTRA_INFO_IE_:/* HT info */ +case WLAN_EID_HT_OPERATION :/* HT info */ bwmode_update_check (padapter, pIE);break ; -case _ERPINFO_IE_: +case WLAN_EID_ERP_INFO :ERP_IE_handler (padapter, pIE);VCS_update (padapter, psta);break ;
@@ -1022,11 +1022,11 @@ unsigned int is_ap_in_tkip(struct adapter *padapter) pIE = (struct ndis_802_11_var_ie *)(pmlmeinfo->network.ies + i);switch (pIE->ElementID) { -case _VENDOR_SPECIFIC_IE_: +case WLAN_EID_VENDOR_SPECIFIC :if ((!memcmp (pIE->data,RTW_WPA_OUI ,4 )) && (!memcmp ((pIE->data +12 ),WPA_TKIP_CIPHER ,4 )))return true;break ; -case _RSN_IE_2_: +case WLAN_EID_RSN :if (!memcmp ((pIE->data +8 ),RSN_TKIP_CIPHER ,4 ))return true;default :
@@ -1188,7 +1188,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len) pIE = (struct ndis_802_11_var_ie *)(pframe + i);switch (pIE->ElementID) { -case _VENDOR_SPECIFIC_IE_: +case WLAN_EID_VENDOR_SPECIFIC :if ((!memcmp (pIE->data,ARTHEROS_OUI1 ,3 )) || (!memcmp (pIE->data,ARTHEROS_OUI2 ,3 ))) {DBG_88E ("link to Artheros AP\n" );
@@ -1374,7 +1374,7 @@ int update_sta_support_rate(struct adapter *padapter, u8 *pvar_ie, uint var_ie_lstruct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; - pIE = (struct ndis_802_11_var_ie *)rtw_get_ie (pvar_ie, _SUPPORTEDRATES_IE_, &ie_len, var_ie_len); + pIE = (struct ndis_802_11_var_ie *)rtw_get_ie (pvar_ie,WLAN_EID_SUPP_RATES , &ie_len, var_ie_len);if (!pIE)return _FAIL;if (ie_len >NDIS_802_11_LENGTH_RATES_EX )
@@ -1383,7 +1383,7 @@ int update_sta_support_rate(struct adapter *padapter, u8 *pvar_ie, uint var_ie_lmemcpy (pmlmeinfo->FW_sta_info[cam_idx].SupportedRates, pIE->data, ie_len); supportRateNum = ie_len; - pIE = (struct ndis_802_11_var_ie *)rtw_get_ie (pvar_ie, _EXT_SUPPORTEDRATES_IE_, &ie_len, var_ie_len); + pIE = (struct ndis_802_11_var_ie *)rtw_get_ie (pvar_ie,WLAN_EID_EXT_SUPP_RATES , &ie_len, var_ie_len);if (pIE) {if (supportRateNum + ie_len >NDIS_802_11_LENGTH_RATES_EX )return _FAIL;
drivers/staging/rtl8188eu/core/rtw_xmit.c +5 -5
@@ -1099,7 +1099,7 @@ void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)break ;case AUTO_VCS :default : - perp =rtw_get_ie (ie, _ERPINFO_IE_, &erp_len, ie_len); + perp =rtw_get_ie (ie,WLAN_EID_ERP_INFO , &erp_len, ie_len);if (!perp) { pxmitpriv->vcs =NONE_VCS ; }else {
@@ -1670,7 +1670,7 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fra pstapriv->tim_bitmap |=BIT (0 );/* */ pstapriv->sta_dz_bitmap |=BIT (0 ); -update_beacon (padapter, _TIM_IE_,NULL , false);/* tx bc/mc packets after update bcn */ +update_beacon (padapter,WLAN_EID_TIM ,NULL , false);/* tx bc/mc packets after update bcn */ ret = true; }
@@ -1721,7 +1721,7 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fraif (psta->sleepq_len ==1 ) {/* update BCN for TIM IE */ -update_beacon (padapter, _TIM_IE_,NULL , false); +update_beacon (padapter,WLAN_EID_TIM ,NULL , false); } } ret = true;
@@ -1930,7 +1930,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) }if (update_mask) -update_beacon (padapter, _TIM_IE_,NULL , false); +update_beacon (padapter,WLAN_EID_TIM ,NULL , false); }void xmit_delivery_enabled_frames (struct adapter *padapter,struct sta_info *psta)
@@ -1995,7 +1995,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst pstapriv->tim_bitmap &= ~BIT (psta->aid);/* update BCN for TIM IE */ -update_beacon (padapter, _TIM_IE_,NULL , false); +update_beacon (padapter,WLAN_EID_TIM ,NULL , false); } }
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +5 -5
@@ -249,27 +249,27 @@ static void ConstructBeacon(struct adapter *adapt, u8 *pframe, u32 *pLength)/* below for ad-hoc mode */ /* SSID */ - pframe =rtw_set_ie (pframe, _SSID_IE_, cur_network->ssid.ssid_length, cur_network->ssid.ssid, &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SSID , cur_network->ssid.ssid_length, cur_network->ssid.ssid, &pktlen);/* supported rates... */ rate_len =rtw_get_rateset_len (cur_network->SupportedRates); - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,min_t (u32, rate_len,8 ), cur_network->SupportedRates, &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_SUPP_RATES ,min_t (u32, rate_len,8 ), cur_network->SupportedRates, &pktlen);/* DS parameter set */ - pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&cur_network->Configuration.DSConfig, &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_DS_PARAMS ,1 , (unsigned char *)&cur_network->Configuration.DSConfig, &pktlen);if ((pmlmeinfo->state &0x03 ) ==WIFI_FW_ADHOC_STATE ) {u32 ATIMWindow;/* IBSS Parameter Set... */ ATIMWindow =0 ; - pframe =rtw_set_ie (pframe, _IBSS_PARA_IE_,2 , (unsigned char *)(&ATIMWindow), &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_IBSS_PARAMS ,2 , (unsigned char *)(&ATIMWindow), &pktlen); }/* todo: ERP IE */ /* EXTERNDED SUPPORTED RATE */ if (rate_len >8 ) - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (rate_len -8 ), (cur_network->SupportedRates +8 ), &pktlen); + pframe =rtw_set_ie (pframe,WLAN_EID_EXT_SUPP_RATES , (rate_len -8 ), (cur_network->SupportedRates +8 ), &pktlen);/* todo:HT for adhoc */
drivers/staging/rtl8188eu/include/rtw_security.h +0 -3
@@ -21,9 +21,6 @@#define is_wep_enc (alg) (((alg) == _WEP40_) || ((alg) == _WEP104_)) -#define _WPA_IE_ID_ 0xdd -#define _WPA2_IE_ID_ 0x30 -#define SHA256_MAC_LEN 32#define AES_BLOCK_SIZE 16#define AES_PRIV_SIZE (4 * 44)
drivers/staging/rtl8188eu/include/wifi.h +0 -34
@@ -330,40 +330,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _FIXED_IE_LENGTH_ _BEACON_IE_OFFSET_ -#define _SSID_IE_ 0 -#define _SUPPORTEDRATES_IE_ 1 -#define _DSSET_IE_ 3 -#define _TIM_IE_ 5 -#define _IBSS_PARA_IE_ 6 -#define _COUNTRY_IE_ 7 -#define _CHLGETXT_IE_ 16 -#define _SUPPORTED_CH_IE_ 36 -#define _CH_SWTICH_ANNOUNCE_ 37/* Secondary Channel Offset */ -#define _RSN_IE_2_ 48 -#define _SSN_IE_1_ 221 -#define _ERPINFO_IE_ 42 -#define _EXT_SUPPORTEDRATES_IE_ 50 - -#define _HT_CAPABILITY_IE_ 45 -#define _FTIE_ 55 -#define _TIMEOUT_ITVL_IE_ 56 -#define _SRC_IE_ 59 -#define _HT_EXTRA_INFO_IE_ 61 -#define _HT_ADD_INFO_IE_ 61/* _HT_EXTRA_INFO_IE_ */ -#define _WAPI_IE_ 68 - -#define EID_BSSCoexistence 72/* 20/40 BSS Coexistence */ -#define EID_BSSIntolerantChlReport 73 -#define _RIC_Descriptor_IE_ 75 - -#define _LINK_ID_IE_ 101 -#define _CH_SWITCH_TIMING_ 104 -#define _PTI_BUFFER_STATUS_ 106 -#define _EXT_CAP_IE_ 127 -#define _VENDOR_SPECIFIC_IE_ 221 - -#define _RESERVED47_ 47 -/* --------------------------------------------------------------------------- Below is the fixed elements... -----------------------------------------------------------------------------*/
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +5 -5
@@ -120,7 +120,7 @@ static char *translate_scan(struct adapter *padapter, start =iwe_stream_add_point (info, start, stop, &iwe, pnetwork->network.ssid.ssid);/* parsing HT_CAP_IE */ - p =rtw_get_ie (&pnetwork->network.ies[12 ], _HT_CAPABILITY_IE_, &ht_ielen, pnetwork->network.ie_length -12 ); + p =rtw_get_ie (&pnetwork->network.ies[12 ],WLAN_EID_HT_CAPABILITY , &ht_ielen, pnetwork->network.ie_length -12 );if (p && ht_ielen >0 ) {struct ieee80211_ht_cap *pht_capie;
@@ -587,7 +587,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short iewhile (cnt < ielen) { eid = buf[cnt]; -if ((eid == _VENDOR_SPECIFIC_IE_) && (!memcmp (&buf[cnt +2 ], wps_oui,4 ))) { +if ((eid ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&buf[cnt +2 ], wps_oui,4 ))) {DBG_88E ("SET WPS_IE\n" ); padapter->securitypriv.wps_ie_len =min (buf[cnt +1 ] +2 ,MAX_WPA_IE_LEN <<2 );
@@ -629,7 +629,7 @@ static int rtw_wx_get_name(struct net_device *dev,if (check_fwstate (pmlmepriv, _FW_LINKED |WIFI_ADHOC_MASTER_STATE )) {/* parsing HT_CAP_IE */ - p =rtw_get_ie (&pcur_bss->ies[12 ], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->ie_length -12 ); + p =rtw_get_ie (&pcur_bss->ies[12 ],WLAN_EID_HT_CAPABILITY , &ht_ielen, pcur_bss->ie_length -12 );if (p && ht_ielen >0 ) ht_cap = true;
@@ -2633,7 +2633,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param,memcpy (pmlmepriv->wps_beacon_ie, param->u.bcn_ie.buf, ie_len); -update_beacon (padapter, _VENDOR_SPECIFIC_IE_, wps_oui, true); +update_beacon (padapter,WLAN_EID_VENDOR_SPECIFIC , wps_oui, true); pmlmeext->bstart_bss = true; }
@@ -2874,7 +2874,7 @@ static int rtw_wx_set_priv(struct net_device *dev,int probereq_wpsie_len = len;u8 wps_oui[4 ] = {0x0 ,0x50 ,0xf2 ,0x04 }; -if ((probereq_wpsie[0 ] == _VENDOR_SPECIFIC_IE_) && +if ((probereq_wpsie[0 ] ==WLAN_EID_VENDOR_SPECIFIC ) && (!memcmp (&probereq_wpsie[2 ], wps_oui,4 ))) { cp_sz =min (probereq_wpsie_len,MAX_WPS_IE_LEN );
drivers/staging/rtl8188eu/os_dep/mlme_linux.c +1 -1
@@ -90,7 +90,7 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)RT_TRACE (_module_mlme_osdep_c_, _drv_info_, ("+%s, authmode=%d\n" , __func__, authmode)); buff =NULL ; -if (authmode == _WPA_IE_ID_) { +if (authmode ==WLAN_EID_VENDOR_SPECIFIC ) {RT_TRACE (_module_mlme_osdep_c_, _drv_info_, ("%s, authmode=%d\n" , __func__, authmode)); buff =rtw_malloc (IW_CUSTOM_MAX );
Signature · 1 line
2.26.2