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

rtl8188eu: Replace wrapper for memcpy

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-02-19 14:50:04 -06:00
parent 120368c717
commit 529328fd3d
30 changed files with 921 additions and 927 deletions
Download patch file Download diff file Expand all files Collapse all files

50
core/rtw_mlme.c
View file

@ -462,7 +462,7 @@ u16 rtw_get_capability(WLAN_BSSID_EX *bss)
{
__le16 val;
_rtw_memcpy((u8 *)&val, rtw_get_capability_from_ie(bss->IEs), 2);
memcpy((u8 *)&val, rtw_get_capability_from_ie(bss->IEs), 2);
return le16_to_cpu(val);
}
@ -599,8 +599,8 @@ int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst, u8 feature)
__le16 ls_cap, ld_cap;
u16 s_cap, d_cap;
_rtw_memcpy((u8 *)&ls_cap, rtw_get_capability_from_ie(src->IEs), 2);
_rtw_memcpy((u8 *)&ld_cap, rtw_get_capability_from_ie(dst->IEs), 2);
memcpy((u8 *)&ls_cap, rtw_get_capability_from_ie(src->IEs), 2);
memcpy((u8 *)&ld_cap, rtw_get_capability_from_ie(dst->IEs), 2);
s_cap = le16_to_cpu(ls_cap);
@ -718,7 +718,7 @@ void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src,
if (update_ie) {
dst->Reserved[0] = src->Reserved[0];
dst->Reserved[1] = src->Reserved[1];
_rtw_memcpy((u8 *)dst, (u8 *)src, get_WLAN_BSSID_EX_sz(src));
memcpy((u8 *)dst, (u8 *)src, get_WLAN_BSSID_EX_sz(src));
}
dst->PhyInfo.SignalStrength = ss_final;
@ -827,7 +827,7 @@ void rtw_update_scanned_network(struct adapter *adapter, WLAN_BSSID_EX *target)
//target->PhyInfo.Optimum_antenna = pHalData->CurAntenna;//optimum_antenna=>For antenna diversity
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(target->PhyInfo.Optimum_antenna));
#endif
_rtw_memcpy(&(pnetwork->network), target, get_WLAN_BSSID_EX_sz(target));
memcpy(&(pnetwork->network), target, get_WLAN_BSSID_EX_sz(target));
//pnetwork->last_scanned = rtw_get_current_time();
// variable initialize
pnetwork->fixed = false;
@ -857,7 +857,7 @@ void rtw_update_scanned_network(struct adapter *adapter, WLAN_BSSID_EX *target)
//target->PhyInfo.Optimum_antenna = pHalData->CurAntenna;
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(target->PhyInfo.Optimum_antenna));
#endif
_rtw_memcpy(&(pnetwork->network), target, bssid_ex_sz );
memcpy(&(pnetwork->network), target, bssid_ex_sz );
pnetwork->last_scanned = rtw_get_current_time();
@ -1032,12 +1032,12 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)
struct wlan_network* ibss_wlan = NULL;
_irqL irqL;
_rtw_memcpy(pmlmepriv->cur_network.network.IEs, pnetwork->IEs, 8);
memcpy(pmlmepriv->cur_network.network.IEs, pnetwork->IEs, 8);
_enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
ibss_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->MacAddress);
if(ibss_wlan)
{
_rtw_memcpy(ibss_wlan->network.IEs , pnetwork->IEs, 8);
memcpy(ibss_wlan->network.IEs , pnetwork->IEs, 8);
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
goto exit;
}
@ -1139,7 +1139,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("switching to adhoc master\n"));
_rtw_memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
_rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID));
memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID));
rtw_update_registrypriv_dev_network(adapter);
rtw_generate_random_ibss(pibss);
@ -1653,10 +1653,10 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
// why not use ptarget_wlan??
_rtw_memcpy(&cur_network->network, &pnetwork->network, pnetwork->network.Length);
memcpy(&cur_network->network, &pnetwork->network, pnetwork->network.Length);
// some IEs in pnetwork is wrong, so we should use ptarget_wlan IEs
cur_network->network.IELength = ptarget_wlan->network.IELength;
_rtw_memcpy(&cur_network->network.IEs[0], &ptarget_wlan->network.IEs[0], MAX_IE_SZ);
memcpy(&cur_network->network.IEs[0], &ptarget_wlan->network.IEs[0], MAX_IE_SZ);
cur_network->aid = pnetwork->join_res;
@ -1973,7 +1973,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
if(passoc_req)
{
assoc_req_len = psta->assoc_req_len;
_rtw_memcpy(passoc_req, psta->passoc_req, assoc_req_len);
memcpy(passoc_req, psta->passoc_req, assoc_req_len);
rtw_mfree(psta->passoc_req , psta->assoc_req_len);
psta->passoc_req = NULL;
@ -2169,10 +2169,10 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
pdev_network = &(adapter->registrypriv.dev_network);
pibss = adapter->registrypriv.dev_network.MacAddress;
_rtw_memcpy(pdev_network, &tgt_network->network, get_WLAN_BSSID_EX_sz(&tgt_network->network));
memcpy(pdev_network, &tgt_network->network, get_WLAN_BSSID_EX_sz(&tgt_network->network));
_rtw_memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
_rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID));
memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID));
rtw_update_registrypriv_dev_network(adapter);
@ -2709,20 +2709,20 @@ sint rtw_set_key(struct adapter * adapter,struct security_priv *psecuritypriv,si
case _WEP40_:
keylen=5;
_rtw_memcpy(&(psetkeyparm->key[0]), &(psecuritypriv->dot11DefKey[keyid].skey[0]), keylen);
memcpy(&(psetkeyparm->key[0]), &(psecuritypriv->dot11DefKey[keyid].skey[0]), keylen);
break;
case _WEP104_:
keylen=13;
_rtw_memcpy(&(psetkeyparm->key[0]), &(psecuritypriv->dot11DefKey[keyid].skey[0]), keylen);
memcpy(&(psetkeyparm->key[0]), &(psecuritypriv->dot11DefKey[keyid].skey[0]), keylen);
break;
case _TKIP_:
keylen=16;
_rtw_memcpy(&psetkeyparm->key, &psecuritypriv->dot118021XGrpKey[keyid], keylen);
memcpy(&psetkeyparm->key, &psecuritypriv->dot118021XGrpKey[keyid], keylen);
psetkeyparm->grpkey=1;
break;
case _AES_:
keylen=16;
_rtw_memcpy(&psetkeyparm->key, &psecuritypriv->dot118021XGrpKey[keyid], keylen);
memcpy(&psetkeyparm->key, &psecuritypriv->dot118021XGrpKey[keyid], keylen);
psetkeyparm->grpkey=1;
break;
default:
@ -2870,7 +2870,7 @@ static int rtw_append_pmkid(struct adapter *Adapter,int iEntry, u8 *ie, uint ie_
ie_len++;
ie[ie_len]=0; //PMKID count = 0x0100
ie_len++;
_rtw_memcpy( &ie[ie_len], &psecuritypriv->PMKIDList[iEntry].PMKID, 16);
memcpy( &ie[ie_len], &psecuritypriv->PMKIDList[iEntry].PMKID, 16);
ie_len+=16;
ie[13]+=18;//PMKID length = 2+16
@ -2899,7 +2899,7 @@ sint rtw_restruct_sec_ie(struct adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_
ndisauthmode, ndissecuritytype));
//copy fixed ie only
_rtw_memcpy(out_ie, in_ie,12);
memcpy(out_ie, in_ie,12);
ielength=12;
if((ndisauthmode==Ndis802_11AuthModeWPA)||(ndisauthmode==Ndis802_11AuthModeWPAPSK))
authmode=_WPA_IE_ID_;
@ -2908,14 +2908,14 @@ sint rtw_restruct_sec_ie(struct adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_
if(check_fwstate(pmlmepriv, WIFI_UNDER_WPS))
{
_rtw_memcpy(out_ie+ielength, psecuritypriv->wps_ie, psecuritypriv->wps_ie_len);
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_))
{
//copy RSN or SSN
_rtw_memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypriv->supplicant_ie[1]+2);
memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypriv->supplicant_ie[1]+2);
/* debug for CONFIG_IEEE80211W
{
int jj;
@ -2959,9 +2959,9 @@ void rtw_init_registrypriv_dev_network( struct adapter* adapter)
;
_rtw_memcpy(pdev_network->MacAddress, myhwaddr, ETH_ALEN);
memcpy(pdev_network->MacAddress, myhwaddr, ETH_ALEN);
_rtw_memcpy(&pdev_network->Ssid, &pregistrypriv->ssid, sizeof(NDIS_802_11_SSID));
memcpy(&pdev_network->Ssid, &pregistrypriv->ssid, sizeof(NDIS_802_11_SSID));
pdev_network->Configuration.Length=sizeof(NDIS_802_11_CONFIGURATION);
pdev_network->Configuration.BeaconPeriod = 100;
@ -3399,7 +3399,7 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
DBG_871X("roaming from %s("MAC_FMT"), length:%d\n",
pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress),
pnetwork->network.Ssid.SsidLength);
_rtw_memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(NDIS_802_11_SSID));
memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(NDIS_802_11_SSID));
pmlmepriv->assoc_by_bssid = false;