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: 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

42
core/rtw_ap.c
View file

@ -151,7 +151,7 @@ static void update_BCNTIM(struct adapter *padapter)
{
pbackup_remainder_ie = rtw_malloc(remainder_ielen);
if(pbackup_remainder_ie && premainder_ie)
_rtw_memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
}
*dst_ie++=_TIM_IE_;
@ -177,14 +177,14 @@ static void update_BCNTIM(struct adapter *padapter)
}
else if(tim_ielen==5)
{
_rtw_memcpy(dst_ie, &tim_bitmap_le, 2);
memcpy(dst_ie, &tim_bitmap_le, 2);
dst_ie+=2;
}
//copy remainder IE
if(pbackup_remainder_ie)
{
_rtw_memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen);
memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen);
rtw_mfree(pbackup_remainder_ie, remainder_ielen);
}
@ -248,19 +248,19 @@ void rtw_add_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index,
{
pbackup_remainder_ie = rtw_malloc(remainder_ielen);
if(pbackup_remainder_ie && premainder_ie)
_rtw_memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
}
*dst_ie++=index;
*dst_ie++=len;
_rtw_memcpy(dst_ie, data, len);
memcpy(dst_ie, data, len);
dst_ie+=len;
//copy remainder IE
if(pbackup_remainder_ie)
{
_rtw_memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen);
memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen);
rtw_mfree(pbackup_remainder_ie, remainder_ielen);
}
@ -296,13 +296,13 @@ void rtw_remove_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 ind
{
pbackup_remainder_ie = rtw_malloc(remainder_ielen);
if(pbackup_remainder_ie && premainder_ie)
_rtw_memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
}
//copy remainder IE
if(pbackup_remainder_ie)
{
_rtw_memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen);
memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen);
rtw_mfree(pbackup_remainder_ie, remainder_ielen);
}
@ -739,7 +739,7 @@ void update_bmc_sta(struct adapter *padapter)
supportRateNum = rtw_get_rateset_len((u8*)&pcur_network->SupportedRates);
network_type = rtw_check_network_type((u8*)&pcur_network->SupportedRates, supportRateNum, 1);
_rtw_memcpy(psta->bssrateset, &pcur_network->SupportedRates, supportRateNum);
memcpy(psta->bssrateset, &pcur_network->SupportedRates, supportRateNum);
psta->bssratelen = supportRateNum;
//b/g mode ra_bitmap
@ -1091,7 +1091,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
pmlmeext->cur_wireless_mode = pmlmepriv->cur_network.network_type;
//let pnetwork_mlmeext == pnetwork_mlme.
_rtw_memcpy(pnetwork_mlmeext, pnetwork, pnetwork->Length);
memcpy(pnetwork_mlmeext, pnetwork, pnetwork->Length);
//update cur_wireless_mode
update_wireless_mode(padapter);
@ -1100,7 +1100,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
update_capinfo(padapter, rtw_get_capability((WLAN_BSSID_EX *)pnetwork));
#ifdef CONFIG_P2P
_rtw_memcpy(pwdinfo->p2p_group_ssid, pnetwork->Ssid.Ssid, pnetwork->Ssid.SsidLength);
memcpy(pwdinfo->p2p_group_ssid, pnetwork->Ssid.Ssid, pnetwork->Ssid.SsidLength);
pwdinfo->p2p_group_ssid_len = pnetwork->Ssid.SsidLength;
#endif //CONFIG_P2P
@ -1171,7 +1171,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
_rtw_memset(ie, 0, MAX_IE_SZ);
_rtw_memcpy(ie, pbuf, pbss_network->IELength);
memcpy(ie, pbuf, pbss_network->IELength);
if(pbss_network->InfrastructureMode!=Ndis802_11APMode)
@ -1179,7 +1179,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
pbss_network->Rssi = 0;
_rtw_memcpy(pbss_network->MacAddress, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pbss_network->MacAddress, myid(&(padapter->eeprompriv)), ETH_ALEN);
//beacon interval
p = rtw_get_beacon_interval_from_ie(ie);//ie + 8; // 8: TimeStamp, 2: Beacon Interval 2:Capability
@ -1196,7 +1196,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
if(p && ie_len>0)
{
_rtw_memset(&pbss_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
_rtw_memcpy(pbss_network->Ssid.Ssid, (p + 2), ie_len);
memcpy(pbss_network->Ssid.Ssid, (p + 2), ie_len);
pbss_network->Ssid.SsidLength = ie_len;
}
@ -1215,7 +1215,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
if (p != NULL)
{
_rtw_memcpy(supportRate, p+2, ie_len);
memcpy(supportRate, p+2, ie_len);
supportRateNum = ie_len;
}
@ -1223,7 +1223,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_, &ie_len, pbss_network->IELength - _BEACON_IE_OFFSET_);
if (p != NULL)
{
_rtw_memcpy(supportRate+supportRateNum, p+2, ie_len);
memcpy(supportRate+supportRateNum, p+2, ie_len);
supportRateNum += ie_len;
}
@ -1367,7 +1367,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
pht_cap->supp_mcs_set[1] = 0x0;
}
_rtw_memcpy(&pmlmepriv->htpriv.ht_cap, p+2, ie_len);
memcpy(&pmlmepriv->htpriv.ht_cap, p+2, ie_len);
}
@ -1520,7 +1520,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
{
_rtw_init_listhead(&paclnode->list);
_rtw_memcpy(paclnode->addr, addr, ETH_ALEN);
memcpy(paclnode->addr, addr, ETH_ALEN);
paclnode->valid = true;
@ -1684,7 +1684,7 @@ static void update_bcn_wps_ie(struct adapter *padapter)
{
pbackup_remainder_ie = rtw_malloc(remainder_ielen);
if(pbackup_remainder_ie)
_rtw_memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
}
@ -1696,11 +1696,11 @@ static void update_bcn_wps_ie(struct adapter *padapter)
wps_ielen = (uint)pwps_ie_src[1];//to get ie data len
if((wps_offset+wps_ielen+2+remainder_ielen)<=MAX_IE_SZ)
{
_rtw_memcpy(pwps_ie, pwps_ie_src, wps_ielen+2);
memcpy(pwps_ie, pwps_ie_src, wps_ielen+2);
pwps_ie += (wps_ielen+2);
if(pbackup_remainder_ie)
_rtw_memcpy(pwps_ie, pbackup_remainder_ie, remainder_ielen);
memcpy(pwps_ie, pbackup_remainder_ie, remainder_ielen);
//update IELength
pnetwork->IELength = wps_offset + (wps_ielen+2) + remainder_ielen;

42
core/rtw_cmd.c
View file

@ -489,7 +489,7 @@ _next:
pcmd->cmdsz = _RND4((pcmd->cmdsz));//_RND4
_rtw_memcpy(pcmdbuf, pcmd->parmbuf, pcmd->cmdsz);
memcpy(pcmdbuf, pcmd->parmbuf, pcmd->cmdsz);
if(pcmd->cmdcode <= (sizeof(wlancmds) /sizeof(struct cmd_hdl)))
{
@ -736,7 +736,7 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssi
int i;
for (i=0; i<ssid_num && i< RTW_SSID_SCAN_AMOUNT; i++) {
if (ssid[i].SsidLength) {
_rtw_memcpy(&psurveyPara->ssid[i], &ssid[i], sizeof(NDIS_802_11_SSID));
memcpy(&psurveyPara->ssid[i], &ssid[i], sizeof(NDIS_802_11_SSID));
psurveyPara->ssid_num++;
if (0)
DBG_871X(FUNC_ADPT_FMT" ssid:(%s, %d)\n", FUNC_ADPT_ARG(padapter),
@ -750,7 +750,7 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssi
int i;
for (i=0; i<ch_num && i< RTW_CHANNEL_SCAN_AMOUNT; i++) {
if (ch[i].hw_value && !(ch[i].flags & RTW_IEEE80211_CHAN_DISABLED)) {
_rtw_memcpy(&psurveyPara->ch[i], &ch[i], sizeof(struct rtw_ieee80211_channel));
memcpy(&psurveyPara->ch[i], &ch[i], sizeof(struct rtw_ieee80211_channel));
psurveyPara->ch_num++;
if (0)
DBG_871X(FUNC_ADPT_FMT" ch:%u\n", FUNC_ADPT_ARG(padapter),
@ -811,10 +811,10 @@ u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset)
init_h2fwcmd_w_parm_no_rsp(ph2c, pbsetdataratepara, GEN_CMD_CODE(_SetDataRate));
#ifdef MP_FIRMWARE_OFFLOAD
pbsetdataratepara->curr_rateidx = *(u32*)rateset;
// _rtw_memcpy(pbsetdataratepara, rateset, sizeof(u32));
// memcpy(pbsetdataratepara, rateset, sizeof(u32));
#else
pbsetdataratepara->mac_id = 5;
_rtw_memcpy(pbsetdataratepara->datarates, rateset, NumRates);
memcpy(pbsetdataratepara->datarates, rateset, NumRates);
#endif
res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit:
@ -848,7 +848,7 @@ u8 rtw_setbasicrate_cmd(struct adapter *padapter, u8 *rateset)
init_h2fwcmd_w_parm_no_rsp(ph2c, pssetbasicratepara, _SetBasicRate_CMD_);
_rtw_memcpy(pssetbasicratepara->basicrates, rateset, NumRates);
memcpy(pssetbasicratepara->basicrates, rateset, NumRates);
res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit:
@ -1215,15 +1215,15 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork)
_rtw_memset(psecnetwork, 0, t_len);
_rtw_memcpy(psecnetwork, &pnetwork->network, get_WLAN_BSSID_EX_sz(&pnetwork->network));
memcpy(psecnetwork, &pnetwork->network, get_WLAN_BSSID_EX_sz(&pnetwork->network));
auth=&psecuritypriv->authenticator_ie[0];
psecuritypriv->authenticator_ie[0]=(unsigned char)psecnetwork->IELength;
if((psecnetwork->IELength-12) < (256-1)) {
_rtw_memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], psecnetwork->IELength-12);
memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], psecnetwork->IELength-12);
} else {
_rtw_memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], (256-1));
memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], (256-1));
}
psecnetwork->IELength = 0;
@ -1234,7 +1234,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork)
if ( pmlmepriv->assoc_by_bssid == false )
{
_rtw_memcpy( &pmlmepriv->assoc_bssid[ 0 ], &pnetwork->network.MacAddress[ 0 ], ETH_ALEN );
memcpy( &pmlmepriv->assoc_bssid[ 0 ], &pnetwork->network.MacAddress[ 0 ], ETH_ALEN );
}
psecnetwork->IELength = rtw_restruct_sec_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], pnetwork->network.IELength);
@ -1406,7 +1406,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool en
goto exit;
}
_rtw_memcpy(psetstakey_para->addr, sta->hwaddr,ETH_ALEN);
memcpy(psetstakey_para->addr, sta->hwaddr,ETH_ALEN);
if(check_fwstate(pmlmepriv, WIFI_STATION_STATE)){
#ifdef CONFIG_TDLS
@ -1422,13 +1422,13 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool en
if (unicast_key == true) {
#ifdef CONFIG_TDLS
if((sta->tdls_sta_state&TDLS_LINKED_STATE)==TDLS_LINKED_STATE)
_rtw_memcpy(&psetstakey_para->key, sta->tpk.tk, 16);
memcpy(&psetstakey_para->key, sta->tpk.tk, 16);
else
#endif //CONFIG_TDLS
_rtw_memcpy(&psetstakey_para->key, &sta->dot118021x_UncstKey, 16);
memcpy(&psetstakey_para->key, &sta->dot118021x_UncstKey, 16);
}
else {
_rtw_memcpy(&psetstakey_para->key, &psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey, 16);
memcpy(&psetstakey_para->key, &psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey, 16);
}
//jeff: set this becasue at least sw key is ready
@ -1511,7 +1511,7 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue)
ph2c->rsp = (u8 *) psetstakey_rsp;
ph2c->rspsz = sizeof(struct set_stakey_rsp);
_rtw_memcpy(psetstakey_para->addr, sta->hwaddr, ETH_ALEN);
memcpy(psetstakey_para->addr, sta->hwaddr, ETH_ALEN);
psetstakey_para->algorithm = _NO_PRIVACY_;
@ -1551,7 +1551,7 @@ u8 rtw_setrttbl_cmd(struct adapter *padapter, struct setratable_parm *prate_tab
init_h2fwcmd_w_parm_no_rsp(ph2c, psetrttblparm, GEN_CMD_CODE(_SetRaTable));
_rtw_memcpy(psetrttblparm,prate_table,sizeof(struct setratable_parm));
memcpy(psetrttblparm,prate_table,sizeof(struct setratable_parm));
res = rtw_enqueue_cmd(pcmdpriv, ph2c);
exit:
@ -1634,7 +1634,7 @@ u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr)
ph2c->rsp = (u8 *) psetassocsta_rsp;
ph2c->rspsz = sizeof(struct set_assocsta_rsp);
_rtw_memcpy(psetassocsta_para->addr, mac_addr,ETH_ALEN);
memcpy(psetassocsta_para->addr, mac_addr,ETH_ALEN);
res = rtw_enqueue_cmd(pcmdpriv, ph2c);
@ -1669,7 +1669,7 @@ u8 rtw_addbareq_cmd(struct adapter*padapter, u8 tid, u8 *addr)
}
paddbareq_parm->tid = tid;
_rtw_memcpy(paddbareq_parm->addr, addr, ETH_ALEN);
memcpy(paddbareq_parm->addr, addr, ETH_ALEN);
init_h2fwcmd_w_parm_no_rsp(ph2c, paddbareq_parm, GEN_CMD_CODE(_AddBAReq));
@ -2021,7 +2021,7 @@ u8 rtw_tdls_cmd(struct adapter *padapter, u8 *addr, u8 option)
}
_rtw_spinlock(&(padapter->tdlsinfo.cmd_lock));
_rtw_memcpy(TDLSoption->addr, addr, 6);
memcpy(TDLSoption->addr, addr, 6);
TDLSoption->option = option;
_rtw_spinunlock(&(padapter->tdlsinfo.cmd_lock));
init_h2fwcmd_w_parm_no_rsp(pcmdobj, TDLSoption, GEN_CMD_CODE(_TDLS));
@ -3044,13 +3044,13 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
}
pnetwork->Length = get_WLAN_BSSID_EX_sz(pnetwork);
_rtw_memcpy(&(pwlan->network), pnetwork, pnetwork->Length);
memcpy(&(pwlan->network), pnetwork, pnetwork->Length);
//pwlan->fixed = true;
//rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue);
// copy pdev_network information to pmlmepriv->cur_network
_rtw_memcpy(&tgt_network->network, pnetwork, (get_WLAN_BSSID_EX_sz(pnetwork)));
memcpy(&tgt_network->network, pnetwork, (get_WLAN_BSSID_EX_sz(pnetwork)));
// reset DSConfig
//tgt_network->network.Configuration.DSConfig = (u32)rtw_ch2freq(pnetwork->Configuration.DSConfig);

56
core/rtw_ieee80211.c
View file

@ -138,7 +138,7 @@ int rtw_check_network_type(unsigned char *rate, int ratelen, int channel)
u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len, unsigned char *source,
unsigned int *frlen)
{
_rtw_memcpy((void *)pbuf, (void *)source, len);
memcpy((void *)pbuf, (void *)source, len);
*frlen = *frlen + len;
return (pbuf + len);
}
@ -159,7 +159,7 @@ u8 *rtw_set_ie
*(pbuf + 1) = (u8)len;
if (len > 0)
_rtw_memcpy((void *)(pbuf + 2), (void *)source, len);
memcpy((void *)(pbuf + 2), (void *)source, len);
*frlen = *frlen + (len + 2);
@ -290,7 +290,7 @@ u8 *rtw_get_ie_ex(u8 *in_ie, uint in_len, u8 eid, u8 *oui, u8 oui_len, u8 *ie, u
target_ie = &in_ie[cnt];
if(ie)
_rtw_memcpy(ie, &in_ie[cnt], in_ie[cnt+1]+2);
memcpy(ie, &in_ie[cnt], in_ie[cnt+1]+2);
if(ielen)
*ielen = in_ie[cnt+1]+2;
@ -339,8 +339,8 @@ int rtw_ies_remove_ie(u8 *ies, uint *ies_len, uint offset, u8 eid, u8 *oui, u8 o
u8 *remain_ies = target_ie + target_ielen;
uint remain_len = search_len - (remain_ies - start);
_rtw_memcpy(buf, remain_ies, remain_len);
_rtw_memcpy(target_ie, buf, remain_len);
memcpy(buf, remain_ies, remain_len);
memcpy(target_ie, buf, remain_len);
*ies_len = *ies_len - target_ielen;
ret = _SUCCESS;
@ -363,22 +363,22 @@ void rtw_set_supported_rate(u8* SupportedRates, uint mode)
switch (mode)
{
case WIRELESS_11B:
_rtw_memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
break;
case WIRELESS_11G:
case WIRELESS_11A:
case WIRELESS_11_5N:
case WIRELESS_11A_5N://Todo: no basic rate for ofdm ?
_rtw_memcpy(SupportedRates, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
memcpy(SupportedRates, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
break;
case WIRELESS_11BG:
case WIRELESS_11G_24N:
case WIRELESS_11_24N:
case WIRELESS_11BG_24N:
_rtw_memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
_rtw_memcpy(SupportedRates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
memcpy(SupportedRates, WIFI_CCKRATES, IEEE80211_CCK_RATE_LEN);
memcpy(SupportedRates + IEEE80211_CCK_RATE_LEN, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
break;
}
@ -776,7 +776,7 @@ int rtw_get_wapi_ie(u8 *in_ie,uint in_len,u8 *wapi_ie,u16 *wapi_len)
_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);
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",
@ -824,7 +824,7 @@ int rtw_get_sec_ie(u8 *in_ie,uint in_len,u8 *rsn_ie,u16 *rsn_len,u8 *wpa_ie,u16
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));
if (wpa_ie) {
_rtw_memcpy(wpa_ie, &in_ie[cnt],in_ie[cnt+1]+2);
memcpy(wpa_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",
@ -843,7 +843,7 @@ int rtw_get_sec_ie(u8 *in_ie,uint in_len,u8 *rsn_ie,u16 *rsn_len,u8 *wpa_ie,u16
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));
if (rsn_ie) {
_rtw_memcpy(rsn_ie, &in_ie[cnt],in_ie[cnt+1]+2);
memcpy(rsn_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",
@ -941,7 +941,7 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen)
wpsie_ptr = &in_ie[cnt];
if(wps_ie)
_rtw_memcpy(wps_ie, &in_ie[cnt], in_ie[cnt+1]+2);
memcpy(wps_ie, &in_ie[cnt], in_ie[cnt+1]+2);
if(wps_ielen)
*wps_ielen = in_ie[cnt+1]+2;
@ -1001,7 +1001,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id ,u8 *buf_att
target_attr_ptr = attr_ptr;
if(buf_attr)
_rtw_memcpy(buf_attr, attr_ptr, attr_len);
memcpy(buf_attr, attr_ptr, attr_len);
if(len_attr)
*len_attr = attr_len;
@ -1041,7 +1041,7 @@ u8 *rtw_get_wps_attr_content(u8 *wps_ie, uint wps_ielen, u16 target_attr_id ,u8
if(attr_ptr && attr_len)
{
if(buf_content)
_rtw_memcpy(buf_content, attr_ptr+4, attr_len-4);
memcpy(buf_content, attr_ptr+4, attr_len-4);
if(len_content)
*len_content = attr_len-4;
@ -1327,11 +1327,11 @@ void rtw_macaddr_cfg(u8 *mac_addr)
{
mac[jj] = key_2char2num(rtw_initmac[kk], rtw_initmac[kk+ 1]);
}
_rtw_memcpy(mac_addr, mac, ETH_ALEN);
memcpy(mac_addr, mac, ETH_ALEN);
}
else
{ // Use the mac address stored in the Efuse
_rtw_memcpy(mac, mac_addr, ETH_ALEN);
memcpy(mac, mac_addr, ETH_ALEN);
}
if (((mac[0]==0xff) &&(mac[1]==0xff) && (mac[2]==0xff) &&
@ -1346,7 +1346,7 @@ void rtw_macaddr_cfg(u8 *mac_addr)
mac[4] = 0x00;
mac[5] = 0x00;
// use default mac addresss
_rtw_memcpy(mac_addr, mac, ETH_ALEN);
memcpy(mac_addr, mac, ETH_ALEN);
DBG_871X("MAC Address from efuse error, assign default one !!!\n");
}
@ -1446,7 +1446,7 @@ int rtw_p2p_merge_ies(u8 *in_ie, u32 in_len, u8 *merge_ie)
if( merge_ie != NULL)
{
//Set first P2P OUI
_rtw_memcpy(merge_ie, ELOUI, 6);
memcpy(merge_ie, ELOUI, 6);
merge_ie += 6;
while( i < in_len)
@ -1456,7 +1456,7 @@ int rtw_p2p_merge_ies(u8 *in_ie, u32 in_len, u8 *merge_ie)
// Take out the rest of P2P OUIs
if( pIE->ElementID == _VENDOR_SPECIFIC_IE_ && _rtw_memcmp(pIE->data, OUI, 4) )
{
_rtw_memcpy( merge_ie, pIE->data +4, pIE->Length -4);
memcpy( merge_ie, pIE->data +4, pIE->Length -4);
len += pIE->Length-4;
merge_ie += pIE->Length-4;
}
@ -1547,7 +1547,7 @@ u8 *rtw_get_p2p_ie(u8 *in_ie, int in_len, u8 *p2p_ie, uint *p2p_ielen)
if ( p2p_ie != NULL )
{
_rtw_memcpy( p2p_ie, &in_ie[ cnt ], in_ie[ cnt + 1 ] + 2 );
memcpy( p2p_ie, &in_ie[ cnt ], in_ie[ cnt + 1 ] + 2 );
}
if ( p2p_ielen != NULL )
@ -1611,7 +1611,7 @@ u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *buf_attr
target_attr_ptr = attr_ptr;
if(buf_attr)
_rtw_memcpy(buf_attr, attr_ptr, attr_len);
memcpy(buf_attr, attr_ptr, attr_len);
if(len_attr)
*len_attr = attr_len;
@ -1651,7 +1651,7 @@ u8 *rtw_get_p2p_attr_content(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *
if(attr_ptr && attr_len)
{
if(buf_content)
_rtw_memcpy(buf_content, attr_ptr+3, attr_len-3);
memcpy(buf_content, attr_ptr+3, attr_len-3);
if(len_content)
*len_content = attr_len-3;
@ -1672,7 +1672,7 @@ u32 rtw_set_p2p_attr_content(u8 *pbuf, u8 attr_id, u16 attr_len, u8 *pdata_attr)
RTW_PUT_LE16(pbuf + 1, attr_len);
if(pdata_attr)
_rtw_memcpy(pbuf + 3, pdata_attr, attr_len);
memcpy(pbuf + 3, pdata_attr, attr_len);
a_len = attr_len + 3;
@ -1694,7 +1694,7 @@ static uint rtw_p2p_attr_remove(u8 *ie, uint ielen_ori, u8 attr_id)
uint remain_len = ielen-(next_attr-ie);
_rtw_memset(target_attr, 0, target_attr_len);
_rtw_memcpy(target_attr, next_attr, remain_len);
memcpy(target_attr, next_attr, remain_len);
_rtw_memset(target_attr+remain_len, 0, target_attr_len);
*(ie+1) -= target_attr_len;
ielen-=target_attr_len;
@ -1723,7 +1723,7 @@ void rtw_WLAN_BSSID_EX_remove_p2p_attr(WLAN_BSSID_EX *bss_ex, u8 attr_id)
u8 *next_ie = p2p_ie+p2p_ielen;
uint remain_len = bss_ex->IELength-(next_ie_ori-bss_ex->IEs);
_rtw_memcpy(next_ie, next_ie_ori, remain_len);
memcpy(next_ie, next_ie_ori, remain_len);
_rtw_memset(next_ie+remain_len, 0, p2p_ielen_ori-p2p_ielen);
bss_ex->IELength -= p2p_ielen_ori-p2p_ielen;
}
@ -1778,7 +1778,7 @@ int rtw_get_wfd_ie(u8 *in_ie, int in_len, u8 *wfd_ie, uint *wfd_ielen)
{
if ( wfd_ie != NULL )
{
_rtw_memcpy( wfd_ie, &in_ie[ cnt ], in_ie[ cnt + 1 ] + 2 );
memcpy( wfd_ie, &in_ie[ cnt ], in_ie[ cnt + 1 ] + 2 );
}
else
@ -1867,7 +1867,7 @@ int rtw_get_wfd_attr_content(u8 *wfd_ie, uint wfd_ielen, u8 target_attr_id ,u8 *
{
// 3 -> 1 byte for attribute ID field, 2 bytes for length field
if(attr_content)
_rtw_memcpy( attr_content, &wfd_ie[ cnt + 3 ], attrlen );
memcpy( attr_content, &wfd_ie[ cnt + 3 ], attrlen );
if(attr_contentlen)
*attr_contentlen = attrlen;

42
core/rtw_ioctl_set.c
View file

@ -159,7 +159,7 @@ u8 rtw_do_join(struct adapter * padapter)
pibss = padapter->registrypriv.dev_network.MacAddress;
_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(padapter);
@ -272,7 +272,7 @@ handle_tkip_countermeasure:
goto release_mlme_lock;
}
_rtw_memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN);
memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN);
pmlmepriv->assoc_by_bssid=true;
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
@ -395,7 +395,7 @@ handle_tkip_countermeasure:
goto release_mlme_lock;
}
_rtw_memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID));
memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID));
pmlmepriv->assoc_by_bssid=false;
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
@ -467,10 +467,10 @@ handle_tkip_countermeasure:
}
if (ssid && ssid_valid)
_rtw_memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID));
memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID));
if (bssid && bssid_valid) {
_rtw_memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN);
memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN);
pmlmepriv->assoc_by_bssid = true;
}
@ -731,7 +731,7 @@ u8 rtw_set_802_11_add_wep(struct adapter* padapter, NDIS_802_11_WEP *wep){
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_wep:befor memcpy, wep->KeyLength=0x%x wep->KeyIndex=0x%x keyid =%x\n",wep->KeyLength,wep->KeyIndex,keyid));
_rtw_memcpy(&(psecuritypriv->dot11DefKey[keyid].skey[0]),&(wep->KeyMaterial),wep->KeyLength);
memcpy(&(psecuritypriv->dot11DefKey[keyid].skey[0]),&(wep->KeyMaterial),wep->KeyLength);
psecuritypriv->dot11DefKeylen[keyid]=wep->KeyLength;
@ -1006,8 +1006,8 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY:Before memcpy \n"));
_rtw_memcpy(wep->KeyMaterial, key->KeyMaterial, key->KeyLength);
_rtw_memcpy(&(padapter->securitypriv.dot11DefKey[keyindex].skey[0]), key->KeyMaterial, key->KeyLength);
memcpy(wep->KeyMaterial, key->KeyMaterial, key->KeyLength);
memcpy(&(padapter->securitypriv.dot11DefKey[keyindex].skey[0]), key->KeyMaterial, key->KeyLength);
padapter->securitypriv.dot11DefKeylen[keyindex]=key->KeyLength;
padapter->securitypriv.dot11PrivacyKeyIndex=keyindex;
@ -1024,12 +1024,12 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){
if(bgroup == true)
{
NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL;
_rtw_memcpy(&padapter->securitypriv.dot11Grprxpn, &keysrc, 8);
memcpy(&padapter->securitypriv.dot11Grprxpn, &keysrc, 8);
}
else
{
NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL;
_rtw_memcpy(&padapter->securitypriv.dot11Grptxpn, &keysrc, 8);
memcpy(&padapter->securitypriv.dot11Grptxpn, &keysrc, 8);
}
}
@ -1056,8 +1056,8 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){
if((key->KeyIndex & 0x10000000))
{
_rtw_memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8);
_rtw_memcpy(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 24, 8);
memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8);
memcpy(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 24, 8);
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rx mic :0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[0],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[1],
@ -1069,8 +1069,8 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){
}
else
{
_rtw_memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 24, 8);
_rtw_memcpy(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8);
memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 24, 8);
memcpy(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8);
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rx mic :0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[0],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[1],
@ -1082,7 +1082,7 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){
}
//set group key by index
_rtw_memcpy(&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial, key->KeyLength);
memcpy(&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial, key->KeyLength);
key->KeyIndex=key->KeyIndex & 0x03;
@ -1111,7 +1111,7 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){
{
_rtw_memset( &stainfo->dot118021x_UncstKey, 0, 16);// clear keybuffer
_rtw_memcpy(&stainfo->dot118021x_UncstKey, key->KeyMaterial, 16);
memcpy(&stainfo->dot118021x_UncstKey, key->KeyMaterial, 16);
if(encryptionalgo== _TKIP_)
{
@ -1123,12 +1123,12 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){
// if TKIP, save the Receive/Transmit MIC key in KeyMaterial[128-255]
if((key->KeyIndex & 0x10000000)){
_rtw_memcpy(&stainfo->dot11tkiptxmickey, key->KeyMaterial + 16, 8);
_rtw_memcpy(&stainfo->dot11tkiprxmickey, key->KeyMaterial + 24, 8);
memcpy(&stainfo->dot11tkiptxmickey, key->KeyMaterial + 16, 8);
memcpy(&stainfo->dot11tkiprxmickey, key->KeyMaterial + 24, 8);
} else {
_rtw_memcpy(&stainfo->dot11tkiptxmickey, key->KeyMaterial + 24, 8);
_rtw_memcpy(&stainfo->dot11tkiprxmickey, key->KeyMaterial + 16, 8);
memcpy(&stainfo->dot11tkiptxmickey, key->KeyMaterial + 24, 8);
memcpy(&stainfo->dot11tkiprxmickey, key->KeyMaterial + 16, 8);
}
@ -1252,7 +1252,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)
{
pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2);
_rtw_memcpy(&mcs_rate , pht_capie->supp_mcs_set, 2);
memcpy(&mcs_rate , pht_capie->supp_mcs_set, 2);
//bw_40MHz = (pht_capie->cap_info&IEEE80211_HT_CAP_SUP_WIDTH) ? 1:0;
//cur_bwmod is updated by beacon, pmlmeinfo is updated by association response

2
core/rtw_iol.c
View file

@ -88,7 +88,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len
return _FAIL;
}
_rtw_memcpy(xmit_frame->buf_addr + buf_offset + pattrib->pktlen, IOL_cmds, cmd_len);
memcpy(xmit_frame->buf_addr + buf_offset + pattrib->pktlen, IOL_cmds, cmd_len);
pattrib->pktlen += cmd_len;
pattrib->last_txcmdsz += cmd_len;

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;

380
core/rtw_mlme_ext.c
View file

File diff suppressed because it is too large Load diff

128
core/rtw_p2p.c
View file

@ -82,11 +82,11 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
pcur++;
//P2P device address
_rtw_memcpy(pcur, psta->dev_addr, ETH_ALEN);
memcpy(pcur, psta->dev_addr, ETH_ALEN);
pcur += ETH_ALEN;
//P2P interface address
_rtw_memcpy(pcur, psta->hwaddr, ETH_ALEN);
memcpy(pcur, psta->hwaddr, ETH_ALEN);
pcur += ETH_ALEN;
*pcur = psta->dev_cap;
@ -96,13 +96,13 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
RTW_PUT_BE16(pcur, psta->config_methods);
pcur += 2;
_rtw_memcpy(pcur, psta->primary_dev_type, 8);
memcpy(pcur, psta->primary_dev_type, 8);
pcur += 8;
*pcur = psta->num_of_secdev_type;
pcur++;
_rtw_memcpy(pcur, psta->secdev_types_list, psta->num_of_secdev_type*8);
memcpy(pcur, psta->secdev_types_list, psta->num_of_secdev_type*8);
pcur += psta->num_of_secdev_type*8;
if(psta->dev_name_len>0)
@ -115,7 +115,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
RTW_PUT_BE16(pcur, psta->dev_name_len);
pcur += 2;
_rtw_memcpy(pcur, psta->dev_name, psta->dev_name_len);
memcpy(pcur, psta->dev_name, psta->dev_name_len);
pcur += psta->dev_name_len;
}
@ -180,9 +180,9 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da)
fctrl = &(pwlanhdr->frame_ctl);
*(fctrl) = 0;
_rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, pwdinfo->interface_addr, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, pwdinfo->interface_addr, ETH_ALEN);
memcpy(pwlanhdr->addr1, da, ETH_ALEN);
memcpy(pwlanhdr->addr2, pwdinfo->interface_addr, ETH_ALEN);
memcpy(pwlanhdr->addr3, pwdinfo->interface_addr, ETH_ALEN);
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
pmlmeext->mgnt_seq++;
@ -241,9 +241,9 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
fctrl = &(pwlanhdr->frame_ctl);
*(fctrl) = 0;
_rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, pwdinfo->device_addr, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, pwdinfo->device_addr, ETH_ALEN);
memcpy(pwlanhdr->addr1, da, ETH_ALEN);
memcpy(pwlanhdr->addr2, pwdinfo->device_addr, ETH_ALEN);
memcpy(pwlanhdr->addr3, pwdinfo->device_addr, ETH_ALEN);
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
pmlmeext->mgnt_seq++;
@ -320,9 +320,9 @@ static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8* raddr,
fctrl = &(pwlanhdr->frame_ctl);
*(fctrl) = 0;
_rtw_memcpy(pwlanhdr->addr1, raddr, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pwlanhdr->addr1, raddr, ETH_ALEN);
memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN);
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
pmlmeext->mgnt_seq++;
@ -411,9 +411,9 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
fctrl = &(pwlanhdr->frame_ctl);
*(fctrl) = 0;
_rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, pwdinfo->interface_addr, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, pwdinfo->interface_addr, ETH_ALEN);
memcpy(pwlanhdr->addr1, da, ETH_ALEN);
memcpy(pwlanhdr->addr2, pwdinfo->interface_addr, ETH_ALEN);
memcpy(pwlanhdr->addr3, pwdinfo->interface_addr, ETH_ALEN);
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
pmlmeext->mgnt_seq++;
@ -584,7 +584,7 @@ u32 build_beacon_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
// Associated BSSID
if ( check_fwstate(pmlmepriv, _FW_LINKED) == true )
{
_rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
}
else
{
@ -697,7 +697,7 @@ u32 build_probe_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
// Associated BSSID
if ( check_fwstate(pmlmepriv, _FW_LINKED) == true )
{
_rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
}
else
{
@ -855,7 +855,7 @@ u32 build_probe_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 tunnel
// Associated BSSID
if ( check_fwstate(pmlmepriv, _FW_LINKED) == true )
{
_rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
}
else
{
@ -977,7 +977,7 @@ u32 build_assoc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
// Associated BSSID
if ( check_fwstate(pmlmepriv, _FW_LINKED) == true )
{
_rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
}
else
{
@ -1075,7 +1075,7 @@ u32 build_assoc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
// Associated BSSID
if ( check_fwstate(pmlmepriv, _FW_LINKED) == true )
{
_rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
}
else
{
@ -1173,7 +1173,7 @@ u32 build_nego_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
// Associated BSSID
if ( check_fwstate(pmlmepriv, _FW_LINKED) == true )
{
_rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
}
else
{
@ -1271,7 +1271,7 @@ u32 build_nego_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
// Associated BSSID
if ( check_fwstate(pmlmepriv, _FW_LINKED) == true )
{
_rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
}
else
{
@ -1370,7 +1370,7 @@ u32 build_nego_confirm_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
// Associated BSSID
if ( check_fwstate(pmlmepriv, _FW_LINKED) == true )
{
_rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
}
else
{
@ -1469,7 +1469,7 @@ u32 build_invitation_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
// Associated BSSID
if ( check_fwstate(pmlmepriv, _FW_LINKED) == true )
{
_rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
}
else
{
@ -1582,7 +1582,7 @@ u32 build_invitation_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
// Associated BSSID
if ( check_fwstate(pmlmepriv, _FW_LINKED) == true )
{
_rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
}
else
{
@ -1695,7 +1695,7 @@ u32 build_provdisc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
// Associated BSSID
if ( check_fwstate(pmlmepriv, _FW_LINKED) == true )
{
_rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
}
else
{
@ -1794,7 +1794,7 @@ u32 build_provdisc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
// Associated BSSID
if ( check_fwstate(pmlmepriv, _FW_LINKED) == true )
{
_rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
}
else
{
@ -1953,7 +1953,7 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
// Value:
// P2P Device Address
_rtw_memcpy( p2pie + p2pielen, pwdinfo->device_addr, ETH_ALEN );
memcpy( p2pie + p2pielen, pwdinfo->device_addr, ETH_ALEN );
p2pielen += ETH_ALEN;
// Config Method
@ -2047,7 +2047,7 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
p2pielen += 2;
// Value:
_rtw_memcpy( p2pie + p2pielen, pwdinfo->device_name, pwdinfo->device_name_len );
memcpy( p2pie + p2pielen, pwdinfo->device_name, pwdinfo->device_name_len );
p2pielen += pwdinfo->device_name_len;
// Group Info ATTR
@ -2118,7 +2118,7 @@ u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8
// Value:
// P2P Device Address
_rtw_memcpy( p2pie + p2pielen, pwdinfo->device_addr, ETH_ALEN );
memcpy( p2pie + p2pielen, pwdinfo->device_addr, ETH_ALEN );
p2pielen += ETH_ALEN;
// Config Method
@ -2167,7 +2167,7 @@ u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8
p2pielen += 2;
// Value:
_rtw_memcpy( p2pie + p2pielen, pwdinfo->device_name, pwdinfo->device_name_len );
memcpy( p2pie + p2pielen, pwdinfo->device_name, pwdinfo->device_name_len );
p2pielen += pwdinfo->device_name_len;
if ( rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT) )
@ -2185,10 +2185,10 @@ u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8
p2pielen += 2;
// Value:
_rtw_memcpy( p2pie + p2pielen, pdev_raddr, ETH_ALEN );
memcpy( p2pie + p2pielen, pdev_raddr, ETH_ALEN );
p2pielen += ETH_ALEN;
_rtw_memcpy( p2pie + p2pielen, pssid, ussidlen );
memcpy( p2pie + p2pielen, pssid, ussidlen );
p2pielen += ussidlen;
}
@ -2388,7 +2388,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO , pattr_content, (uint*)&attr_contentlen);
_rtw_memcpy(psta->dev_addr, pattr_content, ETH_ALEN);//P2P Device Address
memcpy(psta->dev_addr, pattr_content, ETH_ALEN);//P2P Device Address
pattr_content += ETH_ALEN;
@ -2397,7 +2397,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
pattr_content += 2;
_rtw_memcpy(psta->primary_dev_type, pattr_content, 8);
memcpy(psta->primary_dev_type, pattr_content, 8);
pattr_content += 8;
@ -2416,7 +2416,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
len = (sizeof(psta->secdev_types_list)<(num_of_secdev_type*8)) ? (sizeof(psta->secdev_types_list)) : (num_of_secdev_type*8);
_rtw_memcpy(psta->secdev_types_list, pattr_content, len);
memcpy(psta->secdev_types_list, pattr_content, len);
pattr_content += (num_of_secdev_type*8);
}
@ -2430,7 +2430,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
psta->dev_name_len = (sizeof(psta->dev_name)<dev_name_len) ? sizeof(psta->dev_name):dev_name_len;
_rtw_memcpy(psta->dev_name, pattr_content+4, psta->dev_name_len);
memcpy(psta->dev_name, pattr_content+4, psta->dev_name_len);
}
rtw_mfree(pbuf, attr_contentlen);
@ -2561,22 +2561,22 @@ u8 process_p2p_provdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
{
case WPS_CM_DISPLYA:
{
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "dis", 3 );
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "dis", 3 );
break;
}
case WPS_CM_LABEL:
{
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "lab", 3 );
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "lab", 3 );
break;
}
case WPS_CM_PUSH_BUTTON:
{
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pbc", 3 );
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pbc", 3 );
break;
}
case WPS_CM_KEYPAD:
{
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pad", 3 );
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pad", 3 );
break;
}
}
@ -2687,15 +2687,15 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
if ( wps_devicepassword_id == WPS_DPID_USER_SPEC )
{
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "dis", 3 );
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "dis", 3 );
}
else if ( wps_devicepassword_id == WPS_DPID_REGISTRAR_SPEC )
{
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pad", 3 );
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pad", 3 );
}
else
{
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pbc", 3 );
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pbc", 3 );
}
}
}
@ -2789,8 +2789,8 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
{
// Store the group id information.
_rtw_memcpy( pwdinfo->groupid_info.go_device_addr, pwdinfo->device_addr, ETH_ALEN );
_rtw_memcpy( pwdinfo->groupid_info.ssid, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen );
memcpy( pwdinfo->groupid_info.go_device_addr, pwdinfo->device_addr, ETH_ALEN );
memcpy( pwdinfo->groupid_info.ssid, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen );
}
}
@ -3022,8 +3022,8 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
{
// Store the group id information.
_rtw_memcpy( pwdinfo->groupid_info.go_device_addr, pwdinfo->device_addr, ETH_ALEN );
_rtw_memcpy( pwdinfo->groupid_info.ssid, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen );
memcpy( pwdinfo->groupid_info.go_device_addr, pwdinfo->device_addr, ETH_ALEN );
memcpy( pwdinfo->groupid_info.ssid, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen );
}
}
@ -3098,8 +3098,8 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
_rtw_memset( groupid, 0x00, 38 );
if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen) )
{
_rtw_memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN );
_rtw_memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN );
memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN );
memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN );
}
//Get the next P2P IE
@ -3197,8 +3197,8 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf
if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen) )
{
DBG_871X( "[%s] Ssid = %s, ssidlen = %zu\n", __FUNCTION__, &groupid[ETH_ALEN], strlen(&groupid[ETH_ALEN]) );
_rtw_memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN );
_rtw_memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN );
memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN );
memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN );
}
attr_contentlen = 0;
@ -3243,7 +3243,7 @@ static void find_phase_handler( struct adapter* padapter )
_rtw_memset((unsigned char*)&ssid, 0, sizeof(NDIS_802_11_SSID));
_rtw_memcpy(ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN );
memcpy(ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN );
ssid.SsidLength = P2P_WILDCARD_SSID_LEN;
rtw_p2p_set_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH);
@ -3694,7 +3694,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
if (nego_info->token != dialogToken)
rtw_wdev_nego_info_init(nego_info);
_rtw_memcpy(nego_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN);
memcpy(nego_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN);
nego_info->active = tx ? 1 : 0;
nego_info->token = dialogToken;
nego_info->req_op_ch = op_ch;
@ -3782,7 +3782,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
if (invit_info->token != dialogToken)
rtw_wdev_invit_info_init(invit_info);
_rtw_memcpy(invit_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN);
memcpy(invit_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN);
invit_info->active = tx ? 1 : 0;
invit_info->token = dialogToken;
invit_info->flags = (flags==-1) ? 0x0 : flags;
@ -4019,17 +4019,17 @@ void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength)
{
while(noa_offset < attr_contentlen)
{
//_rtw_memcpy(&wifidirect_info->noa_count[noa_num], &noa_attr[noa_offset], 1);
//memcpy(&wifidirect_info->noa_count[noa_num], &noa_attr[noa_offset], 1);
pwdinfo->noa_count[noa_num] = noa_attr[noa_offset];
noa_offset += 1;
_rtw_memcpy(&pwdinfo->noa_duration[noa_num], &noa_attr[noa_offset], 4);
memcpy(&pwdinfo->noa_duration[noa_num], &noa_attr[noa_offset], 4);
noa_offset += 4;
_rtw_memcpy(&pwdinfo->noa_interval[noa_num], &noa_attr[noa_offset], 4);
memcpy(&pwdinfo->noa_interval[noa_num], &noa_attr[noa_offset], 4);
noa_offset += 4;
_rtw_memcpy(&pwdinfo->noa_start_time[noa_num], &noa_attr[noa_offset], 4);
memcpy(&pwdinfo->noa_start_time[noa_num], &noa_attr[noa_offset], 4);
noa_offset += 4;
noa_num++;
@ -4340,10 +4340,10 @@ void rtw_init_wifidirect_addrs(struct adapter* padapter, u8 *dev_addr, u8 *iface
/*init device&interface address */
if (dev_addr) {
_rtw_memcpy(pwdinfo->device_addr, dev_addr, ETH_ALEN);
memcpy(pwdinfo->device_addr, dev_addr, ETH_ALEN);
}
if (iface_addr) {
_rtw_memcpy(pwdinfo->interface_addr, iface_addr, ETH_ALEN);
memcpy(pwdinfo->interface_addr, iface_addr, ETH_ALEN);
}
#endif
}
@ -4395,7 +4395,7 @@ void init_wifidirect_info( struct adapter* padapter, enum P2P_ROLE role)
pwdinfo->support_rate[6] = 0x60; // 48
pwdinfo->support_rate[7] = 0x6c; // 54
_rtw_memcpy( ( void* ) pwdinfo->p2p_wildcard_ssid, "DIRECT-", 7 );
memcpy( ( void* ) pwdinfo->p2p_wildcard_ssid, "DIRECT-", 7 );
_rtw_memset( pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN );
pwdinfo->device_name_len = 0;

100
core/rtw_recv.c
View file

@ -1222,11 +1222,11 @@ sint sta2sta_data_frame(
}
else if(check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)
{
_rtw_memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN);
_rtw_memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN);
_rtw_memcpy(pattrib->bssid, GetAddr3Ptr(ptr), ETH_ALEN);
_rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN);
memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN);
memcpy(pattrib->bssid, GetAddr3Ptr(ptr), ETH_ALEN);
memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
sta_addr = mybssid;
}
@ -1361,14 +1361,14 @@ sint ap2sta_data_frame(
else if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) &&
(check_fwstate(pmlmepriv, _FW_LINKED) == true) )
{
_rtw_memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN);
_rtw_memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN);
_rtw_memcpy(pattrib->bssid, GetAddr3Ptr(ptr), ETH_ALEN);
_rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN);
memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN);
memcpy(pattrib->bssid, GetAddr3Ptr(ptr), ETH_ALEN);
memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
//
_rtw_memcpy(pattrib->bssid, mybssid, ETH_ALEN);
memcpy(pattrib->bssid, mybssid, ETH_ALEN);
*psta = rtw_get_stainfo(pstapriv, pattrib->bssid); // get sta_info
@ -1693,31 +1693,31 @@ sint validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_
pbssid = get_hdr_bssid(ptr);
_rtw_memcpy(pattrib->dst, pda, ETH_ALEN);
_rtw_memcpy(pattrib->src, psa, ETH_ALEN);
memcpy(pattrib->dst, pda, ETH_ALEN);
memcpy(pattrib->src, psa, ETH_ALEN);
_rtw_memcpy(pattrib->bssid, pbssid, ETH_ALEN);
memcpy(pattrib->bssid, pbssid, ETH_ALEN);
switch(pattrib->to_fr_ds)
{
case 0:
_rtw_memcpy(pattrib->ra, pda, ETH_ALEN);
_rtw_memcpy(pattrib->ta, psa, ETH_ALEN);
memcpy(pattrib->ra, pda, ETH_ALEN);
memcpy(pattrib->ta, psa, ETH_ALEN);
break;
case 1:
_rtw_memcpy(pattrib->ra, pda, ETH_ALEN);
_rtw_memcpy(pattrib->ta, pbssid, ETH_ALEN);
memcpy(pattrib->ra, pda, ETH_ALEN);
memcpy(pattrib->ta, pbssid, ETH_ALEN);
break;
case 2:
_rtw_memcpy(pattrib->ra, pbssid, ETH_ALEN);
_rtw_memcpy(pattrib->ta, psa, ETH_ALEN);
memcpy(pattrib->ra, pbssid, ETH_ALEN);
memcpy(pattrib->ta, psa, ETH_ALEN);
break;
case 3:
_rtw_memcpy(pattrib->ra, GetAddr1Ptr(ptr), ETH_ALEN);
_rtw_memcpy(pattrib->ta, GetAddr2Ptr(ptr), ETH_ALEN);
memcpy(pattrib->ra, GetAddr1Ptr(ptr), ETH_ALEN);
memcpy(pattrib->ta, GetAddr2Ptr(ptr), ETH_ALEN);
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" case 3\n"));
break;
@ -1767,34 +1767,34 @@ sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_f
goto exit;
}
_rtw_memcpy(pattrib->dst, pda, ETH_ALEN);
_rtw_memcpy(pattrib->src, psa, ETH_ALEN);
memcpy(pattrib->dst, pda, ETH_ALEN);
memcpy(pattrib->src, psa, ETH_ALEN);
_rtw_memcpy(pattrib->bssid, pbssid, ETH_ALEN);
memcpy(pattrib->bssid, pbssid, ETH_ALEN);
switch(pattrib->to_fr_ds)
{
case 0:
_rtw_memcpy(pattrib->ra, pda, ETH_ALEN);
_rtw_memcpy(pattrib->ta, psa, ETH_ALEN);
memcpy(pattrib->ra, pda, ETH_ALEN);
memcpy(pattrib->ta, psa, ETH_ALEN);
ret = sta2sta_data_frame(adapter, precv_frame, &psta);
break;
case 1:
_rtw_memcpy(pattrib->ra, pda, ETH_ALEN);
_rtw_memcpy(pattrib->ta, pbssid, ETH_ALEN);
memcpy(pattrib->ra, pda, ETH_ALEN);
memcpy(pattrib->ta, pbssid, ETH_ALEN);
ret = ap2sta_data_frame(adapter, precv_frame, &psta);
break;
case 2:
_rtw_memcpy(pattrib->ra, pbssid, ETH_ALEN);
_rtw_memcpy(pattrib->ta, psa, ETH_ALEN);
memcpy(pattrib->ra, pbssid, ETH_ALEN);
memcpy(pattrib->ta, psa, ETH_ALEN);
ret = sta2ap_data_frame(adapter, precv_frame, &psta);
break;
case 3:
_rtw_memcpy(pattrib->ra, GetAddr1Ptr(ptr), ETH_ALEN);
_rtw_memcpy(pattrib->ta, GetAddr2Ptr(ptr), ETH_ALEN);
memcpy(pattrib->ra, GetAddr1Ptr(ptr), ETH_ALEN);
memcpy(pattrib->ta, GetAddr2Ptr(ptr), ETH_ALEN);
ret =_FAIL;
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" case 3\n"));
break;
@ -1929,8 +1929,8 @@ static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *prec
pattrib->hdrlen = sizeof(struct rtw_ieee80211_hdr_3addr);
//set iv and icv length
SET_ICE_IV_LEN(pattrib->iv_len, pattrib->icv_len, pattrib->encrypt);
_rtw_memcpy(pattrib->ra, GetAddr1Ptr(ptr), ETH_ALEN);
_rtw_memcpy(pattrib->ta, GetAddr2Ptr(ptr), ETH_ALEN);
memcpy(pattrib->ra, GetAddr1Ptr(ptr), ETH_ALEN);
memcpy(pattrib->ta, GetAddr2Ptr(ptr), ETH_ALEN);
//actual management data frame body
data_len = pattrib->pkt_len - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len;
mgmt_DATA = rtw_zmalloc(data_len);
@ -1950,9 +1950,9 @@ static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *prec
precv_frame = decryptor(adapter, precv_frame);
//save actual management data frame body
_rtw_memcpy(mgmt_DATA, ptr+pattrib->hdrlen+pattrib->iv_len, data_len);
memcpy(mgmt_DATA, ptr+pattrib->hdrlen+pattrib->iv_len, data_len);
//overwrite the iv field
_rtw_memcpy(ptr+pattrib->hdrlen, mgmt_DATA, data_len);
memcpy(ptr+pattrib->hdrlen, mgmt_DATA, data_len);
//remove the iv and icv length
pattrib->pkt_len = pattrib->pkt_len - pattrib->iv_len - pattrib->icv_len;
rtw_mfree(mgmt_DATA, data_len);
@ -2296,12 +2296,12 @@ sint wlanhdr_to_ethhdr ( union recv_frame *precvframe)
ptr = recvframe_pull(precvframe, (rmv_len-sizeof(struct ethhdr)+ (bsnaphdr?2:0)));
}
_rtw_memcpy(ptr, pattrib->dst, ETH_ALEN);
_rtw_memcpy(ptr+ETH_ALEN, pattrib->src, ETH_ALEN);
memcpy(ptr, pattrib->dst, ETH_ALEN);
memcpy(ptr+ETH_ALEN, pattrib->src, ETH_ALEN);
if(!bsnaphdr) {
be_tmp = htons(len);
_rtw_memcpy(ptr+12, &be_tmp, 2);
memcpy(ptr+12, &be_tmp, 2);
}
;
@ -2364,7 +2364,7 @@ sint wlanhdr_to_ethhdr ( union recv_frame *precvframe)
ptr += rmv_len ;
_rtw_memcpy(&eth_type, ptr, 2);
memcpy(&eth_type, ptr, 2);
eth_type= ntohs((unsigned short )eth_type); //pattrib->ether_type
ptr +=2;
@ -2397,7 +2397,7 @@ sint wlanhdr_to_ethhdr ( union recv_frame *precvframe)
else if(eth_type==0x8712)// append rx status for mp test packets
{
//ptr -= 16;
//_rtw_memcpy(ptr, get_rxmem(precvframe), 16);
//memcpy(ptr, get_rxmem(precvframe), 16);
}
else
{
@ -2421,17 +2421,17 @@ sint wlanhdr_to_ethhdr ( union recv_frame *precvframe)
if(eth_type==0x8712)// append rx status for mp test packets
{
ptr = recvframe_pull(precvframe, (rmv_len-sizeof(struct ethhdr)+2)-24);
_rtw_memcpy(ptr, get_rxmem(precvframe), 24);
memcpy(ptr, get_rxmem(precvframe), 24);
ptr+=24;
}
else
ptr = recvframe_pull(precvframe, (rmv_len-sizeof(struct ethhdr)+2));
_rtw_memcpy(ptr, pattrib->dst, ETH_ALEN);
_rtw_memcpy(ptr+ETH_ALEN, pattrib->src, ETH_ALEN);
memcpy(ptr, pattrib->dst, ETH_ALEN);
memcpy(ptr+ETH_ALEN, pattrib->src, ETH_ALEN);
eth_type = htons((unsigned short)eth_type) ;
_rtw_memcpy(ptr+12, &eth_type, 2);
memcpy(ptr+12, &eth_type, 2);
exit:
@ -2511,7 +2511,7 @@ static union recv_frame * recvframe_defrag(struct adapter *adapter,_queue *defra
recvframe_pull_tail(prframe, pfhdr->attrib.icv_len);
//memcpy
_rtw_memcpy(pfhdr->rx_tail, pnfhdr->rx_data, pnfhdr->len);
memcpy(pfhdr->rx_tail, pnfhdr->rx_data, pnfhdr->len);
recvframe_put(prframe, pnfhdr->len);
@ -2717,7 +2717,7 @@ int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
{
skb_reserve(sub_skb, 12);
data_ptr = (u8 *)skb_put(sub_skb, nSubframe_Length);
_rtw_memcpy(data_ptr, pdata, nSubframe_Length);
memcpy(data_ptr, pdata, nSubframe_Length);
}
else
#endif // CONFIG_SKB_COPY
@ -2775,8 +2775,8 @@ int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
_rtw_memcmp(sub_skb->data, rtw_bridge_tunnel_header, SNAP_SIZE) )) {
/* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */
skb_pull(sub_skb, SNAP_SIZE);
_rtw_memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->src, ETH_ALEN);
_rtw_memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->dst, ETH_ALEN);
memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->src, ETH_ALEN);
memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->dst, ETH_ALEN);
} else {
__be16 len;
/* Leave Ethernet header part of hdr and full payload */

64
core/rtw_security.c
View file

@ -203,8 +203,8 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
for(curfragnum=0;curfragnum<pattrib->nr_frags;curfragnum++)
{
iv=pframe+pattrib->hdrlen;
_rtw_memcpy(&wepkey[0], iv, 3);
_rtw_memcpy(&wepkey[3], &psecuritypriv->dot11DefKey[psecuritypriv->dot11PrivacyKeyIndex].skey[0],keylength);
memcpy(&wepkey[0], iv, 3);
memcpy(&wepkey[3], &psecuritypriv->dot11DefKey[psecuritypriv->dot11PrivacyKeyIndex].skey[0],keylength);
payload=pframe+pattrib->iv_len+pattrib->hdrlen;
if((curfragnum+1)==pattrib->nr_frags)
@ -263,9 +263,9 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)
//keyindex=(iv[3]&0x3);
keyindex = prxattrib->key_index;
keylength=psecuritypriv->dot11DefKeylen[keyindex];
_rtw_memcpy(&wepkey[0], iv, 3);
//_rtw_memcpy(&wepkey[3], &psecuritypriv->dot11DefKey[psecuritypriv->dot11PrivacyKeyIndex].skey[0],keylength);
_rtw_memcpy(&wepkey[3], &psecuritypriv->dot11DefKey[keyindex].skey[0],keylength);
memcpy(&wepkey[0], iv, 3);
//memcpy(&wepkey[3], &psecuritypriv->dot11DefKey[psecuritypriv->dot11PrivacyKeyIndex].skey[0],keylength);
memcpy(&wepkey[3], &psecuritypriv->dot11DefKey[keyindex].skey[0],keylength);
length= ((union recv_frame *)precvframe)->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len;
payload=pframe+prxattrib->iv_len+prxattrib->hdrlen;
@ -1821,7 +1821,7 @@ static sint aes_decipher(u8 *key, uint hdrlen,
//start to calculate the mic
if((hdrlen +plen+8) <= MAX_MSG_SIZE)
_rtw_memcpy((void *)message, pframe, (hdrlen +plen+8)); //8 is for ext iv len
memcpy((void *)message, pframe, (hdrlen +plen+8)); //8 is for ext iv len
pn_vector[0]=pframe[hdrlen];
@ -2071,7 +2071,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
//mapping to wlan header
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
//save the frame body + MME
_rtw_memcpy(BIP_AAD+BIP_AAD_SIZE, pframe+WLAN_HDR_A3_LEN, pattrib->pkt_len-WLAN_HDR_A3_LEN);
memcpy(BIP_AAD+BIP_AAD_SIZE, pframe+WLAN_HDR_A3_LEN, pattrib->pkt_len-WLAN_HDR_A3_LEN);
//find MME IE pointer
p = rtw_get_ie(BIP_AAD+BIP_AAD_SIZE, _MME_IE_, &len, pattrib->pkt_len-WLAN_HDR_A3_LEN);
//Baron
@ -2080,7 +2080,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
u16 keyid=0;
u64 temp_ipn=0;
//save packet number
_rtw_memcpy(&temp_ipn, p+4, 6);
memcpy(&temp_ipn, p+4, 6);
temp_ipn = le64_to_cpu(temp_ipn);
//BIP packet number should bigger than previous BIP packet
if(temp_ipn <= pmlmeext->mgnt_80211w_IPN_rx)
@ -2089,7 +2089,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
goto BIP_exit;
}
//copy key index
_rtw_memcpy(&keyid, p+2, 2);
memcpy(&keyid, p+2, 2);
keyid = le16_to_cpu(keyid);
if(keyid != padapter->securitypriv.dot11wBIPKeyid)
{
@ -2100,12 +2100,12 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
_rtw_memset(p+2+len-8, 0, 8);
//conscruct AAD, copy frame control field
_rtw_memcpy(BIP_AAD, &pwlanhdr->frame_ctl, 2);
memcpy(BIP_AAD, &pwlanhdr->frame_ctl, 2);
ClearRetry(BIP_AAD);
ClearPwrMgt(BIP_AAD);
ClearMData(BIP_AAD);
//conscruct AAD, copy address 1 to address 3
_rtw_memcpy(BIP_AAD+2, pwlanhdr->addr1, 18);
memcpy(BIP_AAD+2, pwlanhdr->addr1, 18);
if(omac1_aes_128(padapter->securitypriv.dot11wBIPKey[padapter->securitypriv.dot11wBIPKeyid].skey
, BIP_AAD, ori_len, mic))
@ -2231,7 +2231,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
inlen -= block_size;
} else {
n = MIN(inlen, (block_size - md->curlen));
_rtw_memcpy(md->buf + md->curlen, in, n);
memcpy(md->buf + md->curlen, in, n);
md->curlen += n;
in += n;
inlen -= n;
@ -2387,7 +2387,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
/* start out by storing key in ipad */
_rtw_memset(k_pad, 0, sizeof(k_pad));
_rtw_memcpy(k_pad, key, key_len);
memcpy(k_pad, key, key_len);
/* XOR key with ipad values */
for (i = 0; i < 64; i++)
k_pad[i] ^= 0x36;
@ -2402,7 +2402,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
sha256_vector(1 + num_elem, _addr, _len, mac);
_rtw_memset(k_pad, 0, sizeof(k_pad));
_rtw_memcpy(k_pad, key, key_len);
memcpy(k_pad, key, key_len);
/* XOR key with opad values */
for (i = 0; i < 64; i++)
k_pad[i] ^= 0x5c;
@ -2457,7 +2457,7 @@ static void sha256_prf(u8 *key, size_t key_len, char *label,
pos += SHA256_MAC_LEN;
} else {
hmac_sha256_vector(key, key_len, 4, addr, len, hash);
_rtw_memcpy(&buf[pos], hash, plen);
memcpy(&buf[pos], hash, plen);
break;
}
counter++;
@ -2893,13 +2893,13 @@ void wpa_tdls_generate_tpk(struct adapter *padapter, struct sta_info *psta)
*/
if (os_memcmp(myid(&(padapter->eeprompriv)), psta->hwaddr, ETH_ALEN) < 0) {
_rtw_memcpy(data, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(data + ETH_ALEN, psta->hwaddr, ETH_ALEN);
memcpy(data, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(data + ETH_ALEN, psta->hwaddr, ETH_ALEN);
} else {
_rtw_memcpy(data, psta->hwaddr, ETH_ALEN);
_rtw_memcpy(data + ETH_ALEN, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(data, psta->hwaddr, ETH_ALEN);
memcpy(data + ETH_ALEN, myid(&(padapter->eeprompriv)), ETH_ALEN);
}
_rtw_memcpy(data + 2 * ETH_ALEN, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(data + 2 * ETH_ALEN, get_bssid(pmlmepriv), ETH_ALEN);
sha256_prf(key_input, SHA256_MAC_LEN, "TDLS PMK", data, sizeof(data), (u8 *) &psta->tpk, sizeof(psta->tpk));
@ -2936,24 +2936,24 @@ int wpa_tdls_ftie_mic(u8 *kck, u8 trans_seq,
pos = buf;
_lnkid = (struct wpa_tdls_lnkid *) lnkid;
/* 1) TDLS initiator STA MAC address */
_rtw_memcpy(pos, _lnkid->init_sta, ETH_ALEN);
memcpy(pos, _lnkid->init_sta, ETH_ALEN);
pos += ETH_ALEN;
/* 2) TDLS responder STA MAC address */
_rtw_memcpy(pos, _lnkid->resp_sta, ETH_ALEN);
memcpy(pos, _lnkid->resp_sta, ETH_ALEN);
pos += ETH_ALEN;
/* 3) Transaction Sequence number */
*pos++ = trans_seq;
/* 4) Link Identifier IE */
_rtw_memcpy(pos, lnkid, 2 + lnkid[1]);
memcpy(pos, lnkid, 2 + lnkid[1]);
pos += 2 + lnkid[1];
/* 5) RSN IE */
_rtw_memcpy(pos, rsnie, 2 + rsnie[1]);
memcpy(pos, rsnie, 2 + rsnie[1]);
pos += 2 + rsnie[1];
/* 6) Timeout Interval IE */
_rtw_memcpy(pos, timeoutie, 2 + timeoutie[1]);
memcpy(pos, timeoutie, 2 + timeoutie[1]);
pos += 2 + timeoutie[1];
/* 7) FTIE, with the MIC field of the FTIE set to 0 */
_rtw_memcpy(pos, ftie, 2 + ftie[1]);
memcpy(pos, ftie, 2 + ftie[1]);
_ftie = (struct wpa_tdls_ftie *) pos;
_rtw_memset(_ftie->mic, 0, TDLS_MIC_LEN);
pos += 2 + ftie[1];
@ -2986,24 +2986,24 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq,
pos = buf;
/* 1) TDLS initiator STA MAC address */
_rtw_memcpy(pos, lnkid + ETH_ALEN + 2, ETH_ALEN);
memcpy(pos, lnkid + ETH_ALEN + 2, ETH_ALEN);
pos += ETH_ALEN;
/* 2) TDLS responder STA MAC address */
_rtw_memcpy(pos, lnkid + 2 * ETH_ALEN + 2, ETH_ALEN);
memcpy(pos, lnkid + 2 * ETH_ALEN + 2, ETH_ALEN);
pos += ETH_ALEN;
/* 3) Transaction Sequence number */
*pos++ = trans_seq;
/* 4) Link Identifier IE */
_rtw_memcpy(pos, lnkid, 2 + 18);
memcpy(pos, lnkid, 2 + 18);
pos += 2 + 18;
/* 5) RSN IE */
_rtw_memcpy(pos, rsnie, 2 + *(rsnie+1));
memcpy(pos, rsnie, 2 + *(rsnie+1));
pos += 2 + *(rsnie+1);
/* 6) Timeout Interval IE */
_rtw_memcpy(pos, timeoutie, 2 + *(timeoutie+1));
memcpy(pos, timeoutie, 2 + *(timeoutie+1));
pos += 2 + *(timeoutie+1);
/* 7) FTIE, with the MIC field of the FTIE set to 0 */
_rtw_memcpy(pos, ftie, 2 + *(ftie+1));
memcpy(pos, ftie, 2 + *(ftie+1));
pos += 2;
tmp_ftie = (u8 *) (pos+2);
_rtw_memset(tmp_ftie, 0, 16);

4
core/rtw_sta_mgt.c
View file

@ -359,7 +359,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
psta->padapter = pstapriv->padapter;
_rtw_memcpy(psta->hwaddr, hwaddr, ETH_ALEN);
memcpy(psta->hwaddr, hwaddr, ETH_ALEN);
index = wifi_mac_hash(hwaddr);
@ -382,7 +382,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
// So, we initialize the tid_rxseq variable as the 0xffff.
for( i = 0; i < 16; i++ )
_rtw_memcpy( &psta->sta_recvpriv.rxcache.tid_rxseq[ i ], &wRxSeqInitialValue, 2 );
memcpy( &psta->sta_recvpriv.rxcache.tid_rxseq[ i ], &wRxSeqInitialValue, 2 );
RT_TRACE(_module_rtl871x_sta_mgt_c_,_drv_info_,("alloc number_%d stainfo with hwaddr = %x %x %x %x %x %x \n",
pstapriv->asoc_sta_count , hwaddr[0], hwaddr[1], hwaddr[2],hwaddr[3],hwaddr[4],hwaddr[5]));

254
core/rtw_tdls.c
View file

@ -108,9 +108,9 @@ void issue_nulldata_to_TDLS_peer_STA(_adapter *padapter, struct sta_info *ptdls_
SetPwrMgt(fctrl);
}
_rtw_memcpy(pwlanhdr->addr1, ptdls_sta->hwaddr, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN);
memcpy(pwlanhdr->addr1, ptdls_sta->hwaddr, ETH_ALEN);
memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN);
ptdls_sta->sta_xmitpriv.txseq_tid[pattrib->priority]++;
ptdls_sta->sta_xmitpriv.txseq_tid[pattrib->priority] &= 0xFFF;
@ -308,7 +308,7 @@ void rtw_tdls_process_ht_cap(_adapter *adapter, struct sta_info *ptdls_sta, u8 *
ptdls_sta->flags |= WLAN_STA_WME;
_rtw_memcpy(&ptdls_sta->htpriv.ht_cap, data, sizeof(struct rtw_ieee80211_ht_cap));
memcpy(&ptdls_sta->htpriv.ht_cap, data, sizeof(struct rtw_ieee80211_ht_cap));
} else
ptdls_sta->flags &= ~WLAN_STA_HT;
@ -374,14 +374,14 @@ u8 *rtw_tdls_set_ht_cap(_adapter *padapter, u8 *pframe, struct pkt_attrib *pattr
{
case RF_1T1R:
ht_capie.cap_info |= 0x0100;//RX STBC One spatial stream
_rtw_memcpy(ht_capie.supp_mcs_set, MCS_rate_1R, 16);
memcpy(ht_capie.supp_mcs_set, MCS_rate_1R, 16);
break;
case RF_2T2R:
case RF_1T2R:
default:
ht_capie.cap_info|= 0x0200;//RX STBC two spatial stream
_rtw_memcpy(ht_capie.supp_mcs_set, MCS_rate_2R, 16);
memcpy(ht_capie.supp_mcs_set, MCS_rate_2R, 16);
break;
}
@ -440,7 +440,7 @@ void rtw_tdls_process_wfd_ie(struct tdls_info *ptdlsinfo, u8 *ptr, u8 length)
rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_LOCAL_IP_ADDR, attr_content, &attr_contentlen);
if ( attr_contentlen )
{
_rtw_memcpy(ptdlsinfo->wfd_info->peer_ip_address, ( attr_content + 1 ), 4);
memcpy(ptdlsinfo->wfd_info->peer_ip_address, ( attr_content + 1 ), 4);
DBG_871X( "[%s] Peer IP = %02u.%02u.%02u.%02u \n", __FUNCTION__,
ptdlsinfo->wfd_info->peer_ip_address[0], ptdlsinfo->wfd_info->peer_ip_address[1],
ptdlsinfo->wfd_info->peer_ip_address[2], ptdlsinfo->wfd_info->peer_ip_address[3]
@ -472,12 +472,12 @@ void issue_tunneled_probe_req(_adapter *padapter)
pattrib->ether_type = 0x890d;
pattrib->pctrl =0;
_rtw_memcpy(pattrib->dst, baddr, ETH_ALEN);
memcpy(pattrib->dst, baddr, ETH_ALEN);
_rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
update_tdls_attrib(padapter, pattrib);
pattrib->qsel=pattrib->priority;
@ -515,12 +515,12 @@ void issue_tunneled_probe_rsp(_adapter *padapter, union recv_frame *precv_frame)
pattrib->ether_type = 0x890d;
pattrib->pctrl =0;
_rtw_memcpy(pattrib->dst, rx_pkt_pattrib->src, ETH_ALEN);
memcpy(pattrib->dst, rx_pkt_pattrib->src, ETH_ALEN);
_rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
update_tdls_attrib(padapter, pattrib);
pattrib->qsel=pattrib->priority;
@ -565,11 +565,11 @@ void issue_tdls_setup_req(_adapter *padapter, u8 *mac_addr)
pattrib->ether_type = 0x890d;
pattrib->pctrl =0;
_rtw_memcpy(pattrib->dst, mac_addr, ETH_ALEN);
_rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pattrib->dst, mac_addr, ETH_ALEN);
memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
update_tdls_attrib(padapter, pattrib);
@ -649,11 +649,11 @@ void issue_tdls_teardown(_adapter *padapter, u8 *mac_addr)
pattrib->ether_type = 0x890d;
pattrib->pctrl =0;
_rtw_memcpy(pattrib->dst, mac_addr, ETH_ALEN);
_rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pattrib->dst, mac_addr, ETH_ALEN);
memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
update_tdls_attrib(padapter, pattrib);
pattrib->qsel=pattrib->priority;
@ -704,14 +704,14 @@ void issue_tdls_dis_req(_adapter *padapter, u8 *mac_addr)
pattrib->pctrl =0;
if(mac_addr == NULL)
_rtw_memcpy(pattrib->dst, baddr, ETH_ALEN);
memcpy(pattrib->dst, baddr, ETH_ALEN);
else
_rtw_memcpy(pattrib->dst, mac_addr, ETH_ALEN);
memcpy(pattrib->dst, mac_addr, ETH_ALEN);
_rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
update_tdls_attrib(padapter, pattrib);
pattrib->qsel=pattrib->priority;
@ -750,11 +750,11 @@ void issue_tdls_setup_rsp(_adapter *padapter, union recv_frame *precv_frame)
pattrib->ether_type = 0x890d;
pattrib->pctrl =0;
_rtw_memcpy(pattrib->dst, rx_pkt_pattrib->src, ETH_ALEN);
_rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pattrib->dst, rx_pkt_pattrib->src, ETH_ALEN);
memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(pattrib->ra, rx_pkt_pattrib->bssid, ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->ra, rx_pkt_pattrib->bssid, ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
update_tdls_attrib(padapter, pattrib);
pattrib->qsel=pattrib->priority;
@ -794,11 +794,11 @@ void issue_tdls_setup_cfm(_adapter *padapter, union recv_frame *precv_frame)
pattrib->ether_type = 0x890d;
pattrib->pctrl =0;
_rtw_memcpy(pattrib->dst, rx_pkt_pattrib->src, ETH_ALEN);
_rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pattrib->dst, rx_pkt_pattrib->src, ETH_ALEN);
memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(pattrib->ra, rx_pkt_pattrib->bssid, ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->ra, rx_pkt_pattrib->bssid, ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
update_tdls_attrib(padapter, pattrib);
pattrib->qsel=pattrib->priority;
@ -847,14 +847,14 @@ void issue_tdls_dis_rsp(_adapter *padapter, union recv_frame *precv_frame, u8 di
*(fctrl) = 0;
// unicast probe request frame
_rtw_memcpy(pwlanhdr->addr1, rx_pkt_pattrib->src, ETH_ALEN);
_rtw_memcpy(pattrib->dst, pwlanhdr->addr1, ETH_ALEN);
memcpy(pwlanhdr->addr1, rx_pkt_pattrib->src, ETH_ALEN);
memcpy(pattrib->dst, pwlanhdr->addr1, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(pattrib->src, pwlanhdr->addr2, ETH_ALEN);
memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pattrib->src, pwlanhdr->addr2, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, rx_pkt_pattrib->bssid, ETH_ALEN);
_rtw_memcpy(pattrib->ra, pwlanhdr->addr3, ETH_ALEN);
memcpy(pwlanhdr->addr3, rx_pkt_pattrib->bssid, ETH_ALEN);
memcpy(pattrib->ra, pwlanhdr->addr3, ETH_ALEN);
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
pmlmeext->mgnt_seq++;
@ -894,11 +894,11 @@ void issue_tdls_peer_traffic_indication(_adapter *padapter, struct sta_info *ptd
pattrib->ether_type = 0x890d;
pattrib->pctrl =0;
_rtw_memcpy(pattrib->dst, ptdls_sta->hwaddr, ETH_ALEN);
_rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pattrib->dst, ptdls_sta->hwaddr, ETH_ALEN);
memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
//for tdls; pattrib->nr_frags is used to fill dialogtoken
ptdls_sta->dialog = dialogtoken;
@ -939,11 +939,11 @@ void issue_tdls_ch_switch_req(_adapter *padapter, u8 *mac_addr)
pattrib->ether_type = 0x890d;
pattrib->pctrl =0;
_rtw_memcpy(pattrib->dst, mac_addr, ETH_ALEN);
_rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pattrib->dst, mac_addr, ETH_ALEN);
memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
update_tdls_attrib(padapter, pattrib);
@ -981,11 +981,11 @@ void issue_tdls_ch_switch_rsp(_adapter *padapter, u8 *mac_addr)
pattrib->ether_type = 0x890d;
pattrib->pctrl =0;
_rtw_memcpy(pattrib->dst, mac_addr, ETH_ALEN);
_rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
memcpy(pattrib->dst, mac_addr, ETH_ALEN);
memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
update_tdls_attrib(padapter, pattrib);
@ -1036,14 +1036,14 @@ sint On_TDLS_Dis_Rsp(_adapter *adapter, union recv_frame *precv_frame)
{
if( _rtw_memcmp(ptdlsinfo->ss_record.macaddr, empty_addr, ETH_ALEN) )
{
_rtw_memcpy(ptdlsinfo->ss_record.macaddr, psa, ETH_ALEN);
memcpy(ptdlsinfo->ss_record.macaddr, psa, ETH_ALEN);
ptdlsinfo->ss_record.RxPWDBAll = pattrib->RxPWDBAll;
}
else
{
if( ptdlsinfo->ss_record.RxPWDBAll < pattrib->RxPWDBAll )
{
_rtw_memcpy(ptdlsinfo->ss_record.macaddr, psa, ETH_ALEN);
memcpy(ptdlsinfo->ss_record.macaddr, psa, ETH_ALEN);
ptdlsinfo->ss_record.RxPWDBAll = pattrib->RxPWDBAll;
}
}
@ -1170,7 +1170,7 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame)
switch (pIE->ElementID)
{
case _SUPPORTEDRATES_IE_:
_rtw_memcpy(supportRate, pIE->data, pIE->Length);
memcpy(supportRate, pIE->data, pIE->Length);
supportRateNum = pIE->Length;
break;
case _COUNTRY_IE_:
@ -1178,7 +1178,7 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame)
case _EXT_SUPPORTEDRATES_IE_:
if(supportRateNum<=sizeof(supportRate))
{
_rtw_memcpy(supportRate+supportRateNum, pIE->data, pIE->Length);
memcpy(supportRate+supportRateNum, pIE->data, pIE->Length);
supportRateNum += pIE->Length;
}
break;
@ -1190,7 +1190,7 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame)
prsnie=(u8*)pIE;
//check whether initiator STA has CCMP pairwise_cipher.
ppairwise_cipher=prsnie+10;
_rtw_memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 1);
memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 1);
for(k=0;k<pairwise_count;k++){
if(_rtw_memcmp( ppairwise_cipher+4*k, RSN_CIPHER_SUITE_CCMP, 4)==true)
ccmp_have=1;
@ -1207,7 +1207,7 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame)
break;
case _FTIE_:
if(prx_pkt_attrib->encrypt)
_rtw_memcpy(SNonce, (ptr+j+52), 32);
memcpy(SNonce, (ptr+j+52), 32);
break;
case _TIMEOUT_ITVL_IE_:
if(prx_pkt_attrib->encrypt)
@ -1237,7 +1237,7 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame)
//update station supportRate
ptdls_sta->bssratelen = supportRateNum;
_rtw_memcpy(ptdls_sta->bssrateset, supportRate, supportRateNum);
memcpy(ptdls_sta->bssrateset, supportRate, supportRateNum);
//check status code
//if responder STA has/hasn't security on AP, but request hasn't/has RSNIE, it should reject
@ -1266,8 +1266,8 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame)
ptdls_sta->tdls_sta_state|= TDLS_INITIATOR_STATE;
if(prx_pkt_attrib->encrypt){
_rtw_memcpy(ptdls_sta->SNonce, SNonce, 32);
_rtw_memcpy(&(ptdls_sta->TDLS_PeerKey_Lifetime), timeout_interval, 4);
memcpy(ptdls_sta->SNonce, SNonce, 32);
memcpy(&(ptdls_sta->TDLS_PeerKey_Lifetime), timeout_interval, 4);
}
_enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
if(!(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE))
@ -1341,7 +1341,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame)
-1
-FIXED_IE;
_rtw_memcpy(&stat_code, ptr+2, 2);
memcpy(&stat_code, ptr+2, 2);
if(stat_code!=0)
{
@ -1360,7 +1360,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame)
switch (pIE->ElementID)
{
case _SUPPORTEDRATES_IE_:
_rtw_memcpy(supportRate, pIE->data, pIE->Length);
memcpy(supportRate, pIE->data, pIE->Length);
supportRateNum = pIE->Length;
break;
case _COUNTRY_IE_:
@ -1368,7 +1368,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame)
case _EXT_SUPPORTEDRATES_IE_:
if(supportRateNum<=sizeof(supportRate))
{
_rtw_memcpy(supportRate+supportRateNum, pIE->data, pIE->Length);
memcpy(supportRate+supportRateNum, pIE->data, pIE->Length);
supportRateNum += pIE->Length;
}
break;
@ -1378,7 +1378,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame)
prsnie=(u8*)pIE;
//check whether responder STA has CCMP pairwise_cipher.
ppairwise_cipher=prsnie+10;
_rtw_memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 2);
memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 2);
for(k=0;k<pairwise_count;k++){
if(_rtw_memcmp( ppairwise_cipher+4*k, RSN_CIPHER_SUITE_CCMP, 4)==true)
verify_ccmp=1;
@ -1389,7 +1389,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame)
break;
case _FTIE_:
pftie=(u8*)pIE;
_rtw_memcpy(ptdls_sta->ANonce, (ptr+j+20), 32);
memcpy(ptdls_sta->ANonce, (ptr+j+20), 32);
break;
case _TIMEOUT_ITVL_IE_:
ptimeout_ie=(u8*)pIE;
@ -1414,7 +1414,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame)
//update station supportRate
ptdls_sta->bssratelen = supportRateNum;
_rtw_memcpy(ptdls_sta->bssrateset, supportRate, supportRateNum);
memcpy(ptdls_sta->bssrateset, supportRate, supportRateNum);
#ifdef CONFIG_WFD
rtw_tdls_process_wfd_ie(ptdlsinfo, ptr + FIXED_IE, parsing_length - FIXED_IE);
@ -1507,7 +1507,7 @@ sint On_TDLS_Setup_Cfm(_adapter *adapter, union recv_frame *precv_frame)
-ETH_TYPE_LEN
-PAYLOAD_TYPE_LEN
-FIXED_IE;
_rtw_memcpy(&stat_code, ptr+2, 2);
memcpy(&stat_code, ptr+2, 2);
if(stat_code!=0){
DBG_871X( "[%s] stat_code = %d\n, free_tdls_sta", __FUNCTION__, stat_code );
@ -1810,8 +1810,8 @@ sint On_TDLS_Ch_Switch_Req(_adapter *adapter, union recv_frame *precv_frame)
case _LINK_ID_IE_:
break;
case _CH_SWITCH_TIMING_:
_rtw_memcpy(&ptdls_sta->ch_switch_time, pIE->data, 2);
_rtw_memcpy(&ptdls_sta->ch_switch_timeout, pIE->data+2, 2);
memcpy(&ptdls_sta->ch_switch_time, pIE->data, 2);
memcpy(&ptdls_sta->ch_switch_timeout, pIE->data+2, 2);
default:
break;
}
@ -1885,7 +1885,7 @@ sint On_TDLS_Ch_Switch_Rsp(_adapter *adapter, union recv_frame *precv_frame)
-PAYLOAD_TYPE_LEN
-FIXED_IE;
_rtw_memcpy(&stat_code, ptr+2, 2);
memcpy(&stat_code, ptr+2, 2);
if(stat_code!=0){
return _FAIL;
@ -1901,13 +1901,13 @@ sint On_TDLS_Ch_Switch_Rsp(_adapter *adapter, union recv_frame *precv_frame)
case _LINK_ID_IE_:
break;
case _CH_SWITCH_TIMING_:
_rtw_memcpy(&switch_time, pIE->data, 2);
memcpy(&switch_time, pIE->data, 2);
if(switch_time > ptdls_sta->ch_switch_time)
_rtw_memcpy(&ptdls_sta->ch_switch_time, &switch_time, 2);
memcpy(&ptdls_sta->ch_switch_time, &switch_time, 2);
_rtw_memcpy(&switch_timeout, pIE->data+2, 2);
memcpy(&switch_timeout, pIE->data+2, 2);
if(switch_timeout > ptdls_sta->ch_switch_timeout)
_rtw_memcpy(&ptdls_sta->ch_switch_timeout, &switch_timeout, 2);
memcpy(&ptdls_sta->ch_switch_timeout, &switch_timeout, 2);
default:
break;
@ -1989,7 +1989,7 @@ void wfd_ie_tdls(_adapter * padapter, u8 *pframe, u32 *pktlen )
// Associated BSSID
if ( check_fwstate( pmlmepriv, _FW_LINKED) == true )
{
_rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );
}
else
{
@ -2009,7 +2009,7 @@ void wfd_ie_tdls(_adapter * padapter, u8 *pframe, u32 *pktlen )
wfdie[ wfdielen++ ] = 0x01;
// IPv4 Address
_rtw_memcpy( wfdie + wfdielen, pwfd_info->ip_address, 4 );
memcpy( wfdie + wfdielen, pwfd_info->ip_address, 4 );
wfdielen += 4;
pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, pktlen);
@ -2044,7 +2044,7 @@ void rtw_build_tdls_setup_req_ies(_adapter * padapter, struct xmit_frame * pxmit
if(pattrib->encrypt){
for(i=0;i<8;i++){
time=rtw_get_current_time();
_rtw_memcpy(&ptdls_sta->SNonce[4*i], (u8 *)&time, 4);
memcpy(&ptdls_sta->SNonce[4*i], (u8 *)&time, 4);
}
}
@ -2056,7 +2056,7 @@ void rtw_build_tdls_setup_req_ies(_adapter * padapter, struct xmit_frame * pxmit
pframe = rtw_set_fixed_ie(pframe, 1, &(ptdls_sta->dialog), &(pattrib->pktlen));
//capability
_rtw_memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2);
memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2);
if(pattrib->encrypt)
*pframe =*pframe | BIT(4);
@ -2105,13 +2105,13 @@ void rtw_build_tdls_setup_req_ies(_adapter * padapter, struct xmit_frame * pxmit
_rtw_memset(pframe, 0, 84); //All fields except SNonce shall be set to 0
_rtw_memset(pframe, _FTIE_, 1); //version
_rtw_memset((pframe+1), 82, 1); //length
_rtw_memcpy((pframe+52), ptdls_sta->SNonce, 32);
memcpy((pframe+52), ptdls_sta->SNonce, 32);
pframe += 84;
pattrib->pktlen += 84;
//Timeout interval
timeout_itvl[0]=0x02;
_rtw_memcpy(timeout_itvl+1, (u8 *)(&ptdls_sta->TDLS_PeerKey_Lifetime), 4);
memcpy(timeout_itvl+1, (u8 *)(&ptdls_sta->TDLS_PeerKey_Lifetime), 4);
pframe = rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, 5, timeout_itvl, &(pattrib->pktlen));
}
@ -2125,9 +2125,9 @@ void rtw_build_tdls_setup_req_ies(_adapter * padapter, struct xmit_frame * pxmit
pframe = rtw_set_ie(pframe, EID_BSSCoexistence, 1, &iedata, &(pattrib->pktlen));
//Link identifier
_rtw_memcpy(link_id_addr, pattrib->ra, 6);
_rtw_memcpy((link_id_addr+6), pattrib->src, 6);
_rtw_memcpy((link_id_addr+12), pattrib->dst, 6);
memcpy(link_id_addr, pattrib->ra, 6);
memcpy((link_id_addr+6), pattrib->src, 6);
memcpy((link_id_addr+12), pattrib->dst, 6);
pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));
#ifdef CONFIG_WFD
@ -2172,7 +2172,7 @@ void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmit
if(pattrib->encrypt){
for(k=0;k<8;k++){
time=rtw_get_current_time();
_rtw_memcpy(&ptdls_sta->ANonce[4*k], (u8*)&time, 4);
memcpy(&ptdls_sta->ANonce[4*k], (u8*)&time, 4);
}
}
@ -2193,7 +2193,7 @@ void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmit
pframe = rtw_set_fixed_ie(pframe, 1, &(ptdls_sta->dialog), &(pattrib->pktlen));
//capability
_rtw_memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2);
memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2);
if(pattrib->encrypt )
*pframe =*pframe | BIT(4);
@ -2247,15 +2247,15 @@ void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmit
_rtw_memset(pframe, 0, 84); //All fields except SNonce shall be set to 0
_rtw_memset(pframe, _FTIE_, 1); //version
_rtw_memset((pframe+1), 82, 1); //length
_rtw_memcpy((pframe+20), ptdls_sta->ANonce, 32);
_rtw_memcpy((pframe+52), ptdls_sta->SNonce, 32);
memcpy((pframe+20), ptdls_sta->ANonce, 32);
memcpy((pframe+52), ptdls_sta->SNonce, 32);
pframe += 84;
pattrib->pktlen += 84;
//Timeout interval
ptimeout_ie = pframe;
timeout_itvl[0]=0x02;
_rtw_memcpy(timeout_itvl+1, (u8 *)(&ptdls_sta->TDLS_PeerKey_Lifetime), 4);
memcpy(timeout_itvl+1, (u8 *)(&ptdls_sta->TDLS_PeerKey_Lifetime), 4);
pframe = rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, 5, timeout_itvl, &(pattrib->pktlen));
}
@ -2270,9 +2270,9 @@ void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmit
//Link identifier
plinkid_ie = pframe;
_rtw_memcpy(link_id_addr, pattrib->ra, 6);
_rtw_memcpy((link_id_addr+6), pattrib->dst, 6);
_rtw_memcpy((link_id_addr+12), pattrib->src, 6);
memcpy(link_id_addr, pattrib->ra, 6);
memcpy((link_id_addr+6), pattrib->dst, 6);
memcpy((link_id_addr+12), pattrib->src, 6);
pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));
//fill FTIE mic
@ -2329,15 +2329,15 @@ void rtw_build_tdls_setup_cfm_ies(_adapter * padapter, struct xmit_frame * pxmit
_rtw_memset(pframe, 0, 84); //All fields except SNonce shall be set to 0
_rtw_memset(pframe, _FTIE_, 1); //version
_rtw_memset((pframe+1), 82, 1); //length
_rtw_memcpy((pframe+20), ptdls_sta->ANonce, 32);
_rtw_memcpy((pframe+52), ptdls_sta->SNonce, 32);
memcpy((pframe+20), ptdls_sta->ANonce, 32);
memcpy((pframe+52), ptdls_sta->SNonce, 32);
pframe += 84;
pattrib->pktlen += 84;
//Timeout interval
ptimeout_ie = pframe;
timeout_itvl[0]=0x02;
_rtw_memcpy(timeout_itvl+1, (u8 *)(&ptdls_sta->TDLS_PeerKey_Lifetime), 4);
memcpy(timeout_itvl+1, (u8 *)(&ptdls_sta->TDLS_PeerKey_Lifetime), 4);
ptdls_sta->TPK_count=0;
_set_timer(&ptdls_sta->TPK_timer, ptdls_sta->TDLS_PeerKey_Lifetime/TPK_RESEND_COUNT);
pframe = rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, 5, timeout_itvl, &(pattrib->pktlen));
@ -2346,9 +2346,9 @@ void rtw_build_tdls_setup_cfm_ies(_adapter * padapter, struct xmit_frame * pxmit
//HT operation; todo
//Link identifier
plinkid_ie = pframe;
_rtw_memcpy(link_id_addr, pattrib->ra, 6);
_rtw_memcpy((link_id_addr+6), pattrib->src, 6);
_rtw_memcpy((link_id_addr+12), pattrib->dst, 6);
memcpy(link_id_addr, pattrib->ra, 6);
memcpy((link_id_addr+6), pattrib->src, 6);
memcpy((link_id_addr+12), pattrib->dst, 6);
pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));
//fill FTIE mic
@ -2378,13 +2378,13 @@ void rtw_build_tdls_teardown_ies(_adapter * padapter, struct xmit_frame * pxmitf
//Link identifier
if(ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE){
_rtw_memcpy(link_id_addr, pattrib->ra, 6);
_rtw_memcpy((link_id_addr+6), pattrib->src, 6);
_rtw_memcpy((link_id_addr+12), pattrib->dst, 6);
memcpy(link_id_addr, pattrib->ra, 6);
memcpy((link_id_addr+6), pattrib->src, 6);
memcpy((link_id_addr+12), pattrib->dst, 6);
}else if(ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE){
_rtw_memcpy(link_id_addr, pattrib->ra, 6);
_rtw_memcpy((link_id_addr+6), pattrib->dst, 6);
_rtw_memcpy((link_id_addr+12), pattrib->src, 6);
memcpy(link_id_addr, pattrib->ra, 6);
memcpy((link_id_addr+6), pattrib->dst, 6);
memcpy((link_id_addr+12), pattrib->src, 6);
}
pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));
@ -2409,9 +2409,9 @@ void rtw_build_tdls_dis_req_ies(_adapter * padapter, struct xmit_frame * pxmitfr
dialogtoken = (dialogtoken+1)%256;
//Link identifier
_rtw_memcpy(link_id_addr, pattrib->ra, 6);
_rtw_memcpy((link_id_addr+6), pattrib->src, 6);
_rtw_memcpy((link_id_addr+12), pattrib->dst, 6);
memcpy(link_id_addr, pattrib->ra, 6);
memcpy((link_id_addr+6), pattrib->src, 6);
memcpy((link_id_addr+12), pattrib->dst, 6);
pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));
}
@ -2441,7 +2441,7 @@ void rtw_build_tdls_dis_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitfr
pframe = rtw_set_fixed_ie(pframe, 1, &(dialog), &(pattrib->pktlen));
//capability
_rtw_memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2);
memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2);
if(pattrib->encrypt)
*pframe =*pframe | BIT(4);
@ -2487,7 +2487,7 @@ void rtw_build_tdls_dis_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitfr
//Timeout interval
timeout_itvl[0]=0x02;
_rtw_memcpy(timeout_itvl+1, &timeout_interval, 4);
memcpy(timeout_itvl+1, &timeout_interval, 4);
pframe = rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, 5, timeout_itvl, &(pattrib->pktlen));
}
@ -2501,9 +2501,9 @@ void rtw_build_tdls_dis_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitfr
pframe = rtw_set_ie(pframe, EID_BSSCoexistence, 1, &iedata, &(pattrib->pktlen));
//Link identifier
_rtw_memcpy(link_id_addr, pattrib->ra, 6);
_rtw_memcpy((link_id_addr+6), pattrib->dst, 6);
_rtw_memcpy((link_id_addr+12), pattrib->src, 6);
memcpy(link_id_addr, pattrib->ra, 6);
memcpy((link_id_addr+6), pattrib->dst, 6);
memcpy((link_id_addr+12), pattrib->src, 6);
pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));
}
@ -2529,9 +2529,9 @@ void rtw_build_tdls_peer_traffic_indication_ies(_adapter * padapter, struct xmit
pframe = rtw_set_fixed_ie(pframe, 1, &(ptdls_sta->dialog), &(pattrib->pktlen));
//Link identifier
_rtw_memcpy(link_id_addr, pattrib->ra, 6);
_rtw_memcpy((link_id_addr+6), pattrib->src, 6);
_rtw_memcpy((link_id_addr+12), pattrib->dst, 6);
memcpy(link_id_addr, pattrib->ra, 6);
memcpy((link_id_addr+6), pattrib->src, 6);
memcpy((link_id_addr+12), pattrib->dst, 6);
pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));
//PTI control
@ -2570,14 +2570,14 @@ void rtw_build_tdls_ch_switch_req_ies(_adapter * padapter, struct xmit_frame * p
pframe = rtw_set_fixed_ie(pframe, 1, &(ptdlsinfo->candidate_ch), &(pattrib->pktlen));
//Link identifier
_rtw_memcpy(link_id_addr, pattrib->ra, 6);
_rtw_memcpy((link_id_addr+6), pattrib->src, 6);
_rtw_memcpy((link_id_addr+12), pattrib->dst, 6);
memcpy(link_id_addr, pattrib->ra, 6);
memcpy((link_id_addr+6), pattrib->src, 6);
memcpy((link_id_addr+12), pattrib->dst, 6);
pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));
//ch switch timing
_rtw_memcpy(ch_switch_timing, &switch_time, 2);
_rtw_memcpy(ch_switch_timing+2, &switch_timeout, 2);
memcpy(ch_switch_timing, &switch_time, 2);
memcpy(ch_switch_timing+2, &switch_timeout, 2);
pframe = rtw_set_ie(pframe, _CH_SWITCH_TIMING_, 4, ch_switch_timing, &(pattrib->pktlen));
//update ch switch attrib to sta_info
@ -2609,14 +2609,14 @@ void rtw_build_tdls_ch_switch_rsp_ies(_adapter * padapter, struct xmit_frame * p
pframe = rtw_set_fixed_ie(pframe, 2, (u8 *)&ptdls_sta->stat_code, &(pattrib->pktlen));
//Link identifier
_rtw_memcpy(link_id_addr, pattrib->ra, 6);
_rtw_memcpy((link_id_addr+6), pattrib->src, 6);
_rtw_memcpy((link_id_addr+12), pattrib->dst, 6);
memcpy(link_id_addr, pattrib->ra, 6);
memcpy((link_id_addr+6), pattrib->src, 6);
memcpy((link_id_addr+12), pattrib->dst, 6);
pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));
//ch switch timing
_rtw_memcpy(ch_switch_timing, &ptdls_sta->ch_switch_time, 2);
_rtw_memcpy(ch_switch_timing+2, &ptdls_sta->ch_switch_timeout, 2);
memcpy(ch_switch_timing, &ptdls_sta->ch_switch_time, 2);
memcpy(ch_switch_timing+2, &ptdls_sta->ch_switch_timeout, 2);
pframe = rtw_set_ie(pframe, _CH_SWITCH_TIMING_, 4, ch_switch_timing, &(pattrib->pktlen));
}

34
core/rtw_wlan_util.c
View file

@ -301,7 +301,7 @@ void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssrat
_rtw_memset(supportedrates, 0, NumRates);
*bssrate_len = ratetbl2rateset(padapter, supportedrates);
_rtw_memcpy(pbssrate, supportedrates, *bssrate_len);
memcpy(pbssrate, supportedrates, *bssrate_len);
}
void UpdateBrateTbl(
@ -753,7 +753,7 @@ int WMM_param_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
}
pmlmeinfo->WMM_enable = 1;
_rtw_memcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element));
memcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element));
return true;
/*if (pregpriv->wifi_spec == 1)
@ -766,7 +766,7 @@ int WMM_param_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
else
{
pmlmeinfo->WMM_enable = 1;
_rtw_rtw_memcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element));
_rtwmemcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_element));
return true;
}
}
@ -1103,7 +1103,7 @@ void HT_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
return;
pmlmeinfo->HT_info_enable = 1;
_rtw_memcpy(&(pmlmeinfo->HT_info), pIE->data, pIE->Length);
memcpy(&(pmlmeinfo->HT_info), pIE->data, pIE->Length);
#endif //CONFIG_80211N_HT
return;
}
@ -1152,7 +1152,7 @@ void ERP_IE_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
return;
pmlmeinfo->ERP_enable = 1;
_rtw_memcpy(&(pmlmeinfo->ERP_IE), pIE->data, pIE->Length);
memcpy(&(pmlmeinfo->ERP_IE), pIE->data, pIE->Length);
}
void VCS_update(struct adapter *padapter, struct sta_info *psta)
@ -1274,7 +1274,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
/* below is to copy the information element */
bssid->IELength = len;
_rtw_memcpy(bssid->IEs, (pframe + sizeof(struct rtw_ieee80211_hdr_3addr)), bssid->IELength);
memcpy(bssid->IEs, (pframe + sizeof(struct rtw_ieee80211_hdr_3addr)), bssid->IELength);
/* check bw and channel offset */
/* parsing HT_CAP_IE */
@ -1337,7 +1337,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
}
if((NULL != p) && (false == hidden_ssid && (*(p + 1)))) {
_rtw_memcpy(bssid->Ssid.Ssid, (p + 2), *(p + 1));
memcpy(bssid->Ssid.Ssid, (p + 2), *(p + 1));
bssid->Ssid.SsidLength = *(p + 1);
} else {
bssid->Ssid.SsidLength = 0;
@ -1492,7 +1492,7 @@ void process_csa_ie(struct adapter *padapter, u8 *pframe, uint pkt_len)
switch (pIE->ElementID)
{
case _CH_SWTICH_ANNOUNCE_:
_rtw_memcpy(&new_ch_no, pIE->data+1, 1);
memcpy(&new_ch_no, pIE->data+1, 1);
rtw_set_csa_cmd(padapter, new_ch_no);
break;
@ -1827,11 +1827,11 @@ void update_tx_basic_rate(struct adapter *padapter, u8 wirelessmode)
_rtw_memset(supported_rates, 0, NDIS_802_11_LENGTH_RATES_EX);
if ((wirelessmode & WIRELESS_11B) && (wirelessmode == WIRELESS_11B)) {
_rtw_memcpy(supported_rates, rtw_basic_rate_cck, 4);
memcpy(supported_rates, rtw_basic_rate_cck, 4);
} else if (wirelessmode & WIRELESS_11B) {
_rtw_memcpy(supported_rates, rtw_basic_rate_mix, 7);
memcpy(supported_rates, rtw_basic_rate_mix, 7);
} else {
_rtw_memcpy(supported_rates, rtw_basic_rate_ofdm, 3);
memcpy(supported_rates, rtw_basic_rate_ofdm, 3);
}
if (wirelessmode & WIRELESS_11B)
@ -2109,11 +2109,11 @@ void update_bmc_sta_support_rate(struct adapter *padapter, u32 mac_id)
if(pmlmeext->cur_wireless_mode & WIRELESS_11B)
{
// Only B, B/G, and B/G/N AP could use CCK rate
_rtw_memcpy((pmlmeinfo->FW_sta_info[mac_id].SupportedRates), rtw_basic_rate_cck, 4);
memcpy((pmlmeinfo->FW_sta_info[mac_id].SupportedRates), rtw_basic_rate_cck, 4);
}
else
{
_rtw_memcpy((pmlmeinfo->FW_sta_info[mac_id].SupportedRates), rtw_basic_rate_ofdm, 4);
memcpy((pmlmeinfo->FW_sta_info[mac_id].SupportedRates), rtw_basic_rate_ofdm, 4);
}
}
@ -2131,13 +2131,13 @@ int update_sta_support_rate(struct adapter *padapter, u8* pvar_ie, uint var_ie_l
return _FAIL;
}
_rtw_memcpy(pmlmeinfo->FW_sta_info[cam_idx].SupportedRates, pIE->data, ie_len);
memcpy(pmlmeinfo->FW_sta_info[cam_idx].SupportedRates, pIE->data, ie_len);
supportRateNum = ie_len;
pIE = (PNDIS_802_11_VARIABLE_IEs)rtw_get_ie(pvar_ie, _EXT_SUPPORTEDRATES_IE_, &ie_len, var_ie_len);
if (pIE)
{
_rtw_memcpy((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + supportRateNum), pIE->data, ie_len);
memcpy((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + supportRateNum), pIE->data, ie_len);
}
return _SUCCESS;
@ -2247,7 +2247,7 @@ void rtw_get_current_ip_address(struct adapter *padapter, u8 *pcurrentip)
ipaddress[3] = my_ifa_list->ifa_address >> 24;
DBG_871X("%s: %d.%d.%d.%d ==========\n", __func__,
ipaddress[0], ipaddress[1], ipaddress[2], ipaddress[3]);
_rtw_memcpy(pcurrentip, ipaddress, 4);
memcpy(pcurrentip, ipaddress, 4);
}
}
}
@ -2269,7 +2269,7 @@ void rtw_get_sec_iv(struct adapter *padapter, u8*pcur_dot11txpn, u8 *StaAddr)
if (psecpriv->dot11PrivacyAlgrthm != _NO_PRIVACY_ && psta->dot11txpn.val > 0)
psta->dot11txpn.val--;
_rtw_memcpy(pcur_dot11txpn, (u8*)&psta->dot11txpn, 8);
memcpy(pcur_dot11txpn, (u8*)&psta->dot11txpn, 8);
DBG_871X("%s(): CurrentIV: 0x%016llx\n", __func__, psta->dot11txpn.val);
}

100
core/rtw_xmit.c
View file

@ -660,23 +660,23 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
pattrib->ether_type = ntohs(etherhdr.h_proto);
_rtw_memcpy(pattrib->dst, &etherhdr.h_dest, ETH_ALEN);
_rtw_memcpy(pattrib->src, &etherhdr.h_source, ETH_ALEN);
memcpy(pattrib->dst, &etherhdr.h_dest, ETH_ALEN);
memcpy(pattrib->src, &etherhdr.h_source, ETH_ALEN);
pattrib->pctrl = 0;
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) {
_rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
}
else if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
}
else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
_rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
_rtw_memcpy(pattrib->ta, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
memcpy(pattrib->ta, get_bssid(pmlmepriv), ETH_ALEN);
}
pattrib->pktlen = pktfile.pkt_len;
@ -1040,7 +1040,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
mic[0],mic[1],mic[2],mic[3],mic[4],mic[5],mic[6],mic[7]));
//add mic code and add the mic code length in last_txcmdsz
_rtw_memcpy(payload, &(mic[0]),8);
memcpy(payload, &(mic[0]),8);
pattrib->last_txcmdsz+=8;
RT_TRACE(_module_rtl871x_xmit_c_,_drv_info_,("\n ========last pkt========\n"));
@ -1160,26 +1160,26 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->dst);
if((ptdls_sta!=NULL)&&(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE)&&(pattrib->ether_type!=0x0806)){
//TDLS data transfer, ToDS=0, FrDs=0
_rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
direct_link=1;
}else{
// 1.Data transfer to AP
// 2.Arp pkt will relayed by AP
SetToDs(fctrl);
_rtw_memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN);
memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN);
}
}else
#endif //CONFIG_TDLS
{
//Data transfer to AP
SetToDs(fctrl);
_rtw_memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN);
memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN);
}
if (pqospriv->qos_option)
@ -1189,18 +1189,18 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
else if ((check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) ) {
//to_ds = 0, fr_ds = 1;
SetFrDs(fctrl);
_rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, pattrib->src, ETH_ALEN);
memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
memcpy(pwlanhdr->addr2, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pwlanhdr->addr3, pattrib->src, ETH_ALEN);
if(psta->qos_option)
qos_option = true;
}
else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) {
_rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
if(psta->qos_option)
qos_option = true;
@ -1465,32 +1465,32 @@ s32 rtw_make_tdls_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib
case TUNNELED_PROBE_REQ:
case TUNNELED_PROBE_RSP:
SetToDs(fctrl);
_rtw_memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN);
memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN);
break;
case TDLS_CHANNEL_SWITCH_REQUEST:
case TDLS_CHANNEL_SWITCH_RESPONSE:
case TDLS_PEER_PSM_RESPONSE:
case TDLS_PEER_TRAFFIC_RESPONSE:
_rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
tdls_seq=1;
break;
case TDLS_DISCOVERY_REQUEST: //unicast: directly to peer sta, Bcast: via AP
if(_rtw_memcmp(pattrib->dst, baddr, ETH_ALEN) )
{
SetToDs(fctrl);
_rtw_memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN);
memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN);
}
else
{
_rtw_memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
_rtw_memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
tdls_seq=1;
}
break;
@ -1612,7 +1612,7 @@ s32 rtw_xmit_tdls_coalesce(struct adapter * padapter, struct xmit_frame * pxmitf
}
}
_rtw_memcpy(pframe, pattrib->iv, pattrib->iv_len);
memcpy(pframe, pattrib->iv, pattrib->iv_len);
pframe += pattrib->iv_len;
}
@ -1627,7 +1627,7 @@ s32 rtw_xmit_tdls_coalesce(struct adapter * padapter, struct xmit_frame * pxmitf
if ((pattrib->icv_len >0 )&& (pattrib->bswenc)) {
pframe += pattrib->pktlen;
_rtw_memcpy(pframe, pattrib->icv, pattrib->icv_len);
memcpy(pframe, pattrib->icv, pattrib->icv_len);
pframe += pattrib->icv_len;
}
@ -1810,7 +1810,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_fram
}
}
_rtw_memcpy(pframe, pattrib->iv, pattrib->iv_len);
memcpy(pframe, pattrib->iv, pattrib->iv_len);
RT_TRACE(_module_rtl871x_xmit_c_, _drv_notice_,
("rtw_xmitframe_coalesce: keyid=%d pattrib->iv[3]=%.2x pframe=%.2x %.2x %.2x %.2x\n",
@ -1842,7 +1842,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_fram
pframe += mem_sz;
if ((pattrib->icv_len >0 )&& (pattrib->bswenc)) {
_rtw_memcpy(pframe, pattrib->icv, pattrib->icv_len);
memcpy(pframe, pattrib->icv, pattrib->icv_len);
pframe += pattrib->icv_len;
}
@ -1865,7 +1865,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_fram
addr = (SIZE_PTR)(pframe);
mem_start = (unsigned char *)RND4(addr) + hw_hdr_offset;
_rtw_memcpy(mem_start, pbuf_start + hw_hdr_offset, pattrib->hdrlen);
memcpy(mem_start, pbuf_start + hw_hdr_offset, pattrib->hdrlen);
}
@ -1958,7 +1958,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit
//octent 0 and 1 is key index ,BIP keyid is 4 or 5, LSB only need octent 0
MME[0]=padapter->securitypriv.dot11wBIPKeyid;
//copy packet number
_rtw_memcpy(&MME[2], &pmlmeext->mgnt_80211w_IPN, 6);
memcpy(&MME[2], &pmlmeext->mgnt_80211w_IPN, 6);
//increase the packet number
pmlmeext->mgnt_80211w_IPN++;
@ -1969,14 +1969,14 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit
frame_body_len = pattrib->pktlen - sizeof(struct rtw_ieee80211_hdr_3addr);
//conscruct AAD, copy frame control field
_rtw_memcpy(BIP_AAD, &pwlanhdr->frame_ctl, 2);
memcpy(BIP_AAD, &pwlanhdr->frame_ctl, 2);
ClearRetry(BIP_AAD);
ClearPwrMgt(BIP_AAD);
ClearMData(BIP_AAD);
//conscruct AAD, copy address 1 to address 3
_rtw_memcpy(BIP_AAD+2, pwlanhdr->addr1, 18);
memcpy(BIP_AAD+2, pwlanhdr->addr1, 18);
//copy management fram body
_rtw_memcpy(BIP_AAD+BIP_AAD_SIZE, MGMT_body, frame_body_len);
memcpy(BIP_AAD+BIP_AAD_SIZE, MGMT_body, frame_body_len);
/*//dump total packet include MME with zero MIC
{
int i;
@ -1999,7 +1999,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit
printk("\n");
}*/
//copy right BIP mic value, total is 128bits, we use the 0~63 bits
_rtw_memcpy(pframe-8, mic, 8);
memcpy(pframe-8, mic, 8);
/*/dump all packet after mic ok
{
int pp;
@ -2054,7 +2054,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit
}*/
//bakeup original management packet
_rtw_memcpy(tmp_buf, pframe, pattrib->pktlen);
memcpy(tmp_buf, pframe, pattrib->pktlen);
//move to data portion
pframe += pattrib->hdrlen;
@ -2073,10 +2073,10 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit
goto xmitframe_coalesce_fail;
}
//insert iv header into management frame
_rtw_memcpy(pframe, pattrib->iv, pattrib->iv_len);
memcpy(pframe, pattrib->iv, pattrib->iv_len);
pframe += pattrib->iv_len;
//copy mgmt data portion after CCMP header
_rtw_memcpy(pframe, tmp_buf+pattrib->hdrlen, pattrib->pktlen-pattrib->hdrlen);
memcpy(pframe, tmp_buf+pattrib->hdrlen, pattrib->pktlen-pattrib->hdrlen);
//move pframe to end of mgmt pkt
pframe += pattrib->pktlen-pattrib->hdrlen;
//add 8 bytes CCMP IV header to length
@ -2091,7 +2091,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit
}*/
if ((pattrib->icv_len >0 )&& (pattrib->bswenc)) {
_rtw_memcpy(pframe, pattrib->icv, pattrib->icv_len);
memcpy(pframe, pattrib->icv, pattrib->icv_len);
pframe += pattrib->icv_len;
}
//add 8 bytes MIC