diff --git a/core/rtw_ap.c b/core/rtw_ap.c index 529f561..821be2e 100755 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -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; diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 2344d94..e479558 100755 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -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; issid[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; ich[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); diff --git a/core/rtw_ieee80211.c b/core/rtw_ieee80211.c index 8ce51b4..a7bf024 100755 --- a/core/rtw_ieee80211.c +++ b/core/rtw_ieee80211.c @@ -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; diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c index e44590c..7cbe947 100755 --- a/core/rtw_ioctl_set.c +++ b/core/rtw_ioctl_set.c @@ -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 diff --git a/core/rtw_iol.c b/core/rtw_iol.c index fb8beca..e50ebda 100755 --- a/core/rtw_iol.c +++ b/core/rtw_iol.c @@ -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; diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 0dc8ccf..23af81c 100755 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -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; diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 6d29801..ddca2c5 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -328,10 +328,10 @@ static void init_mlme_ext_priv_value(struct adapter* padapter) pmlmeext->cur_wireless_mode = padapter->registrypriv.wireless_mode; - //_rtw_memcpy(pmlmeext->channel_set, DefaultChannelPlan[padapter->mlmepriv.ChannelPlan].Channel, DefaultChannelPlan[padapter->mlmepriv.ChannelPlan].Len); - //_rtw_memcpy(pmlmeext->channel_set, default_channel_set, MAX_CHANNEL_NUM); - _rtw_memcpy(pmlmeext->datarate, mixed_datarate, NumRates); - _rtw_memcpy(pmlmeext->basicrate, mixed_basicrate, NumRates); + //memcpy(pmlmeext->channel_set, DefaultChannelPlan[padapter->mlmepriv.ChannelPlan].Channel, DefaultChannelPlan[padapter->mlmepriv.ChannelPlan].Len); + //memcpy(pmlmeext->channel_set, default_channel_set, MAX_CHANNEL_NUM); + memcpy(pmlmeext->datarate, mixed_datarate, NumRates); + memcpy(pmlmeext->basicrate, mixed_basicrate, NumRates); if(pmlmeext->cur_channel > 14) pmlmeext->tx_rate = IEEE80211_OFDM_RATE_6MB; @@ -912,7 +912,7 @@ _continue: unsigned char *sa_addr = get_sa(pframe); DBG_871X("%s: Find Ozmo RC -- %02x:%02x:%02x:%02x:%02x:%02x \n\n", __func__, *sa_addr, *(sa_addr+1), *(sa_addr+2), *(sa_addr+3), *(sa_addr+4), *(sa_addr+5)); - _rtw_memcpy( pstapriv->atmel_rc_pattern, get_sa(pframe), ETH_ALEN); + memcpy( pstapriv->atmel_rc_pattern, get_sa(pframe), ETH_ALEN); } #endif p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SSID_IE_, (int *)&ielen, @@ -1365,7 +1365,7 @@ auth_fail: pstat = &stat; _rtw_memset((char *)pstat, '\0', sizeof(stat)); pstat->auth_seq = 2; - _rtw_memcpy(pstat->hwaddr, sa, 6); + memcpy(pstat->hwaddr, sa, 6); #ifdef CONFIG_NATIVEAP_MLME issue_auth(padapter, pstat, (unsigned short)status); @@ -1431,7 +1431,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram goto authclnt_fail; } - _rtw_memcpy((void *)(pmlmeinfo->chg_txt), (void *)(p + 2), len); + memcpy((void *)(pmlmeinfo->chg_txt), (void *)(p + 2), len); pmlmeinfo->auth_seq = 3; issue_auth(padapter, NULL, 0); set_link_timer(pmlmeext, REAUTH_TO); @@ -1610,14 +1610,14 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) if (p == NULL) { DBG_871X("Rx a sta assoc-req which supported rate is empty!\n"); // use our own rate set as statoin used - //_rtw_memcpy(supportRate, AP_BSSRATE, AP_BSSRATE_LEN); + //memcpy(supportRate, AP_BSSRATE, AP_BSSRATE_LEN); //supportRateNum = AP_BSSRATE_LEN; status = _STATS_FAILURE_; goto OnAssocReqFail; } else { - _rtw_memcpy(supportRate, p+2, ie_len); + memcpy(supportRate, p+2, ie_len); supportRateNum = ie_len; p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _EXT_SUPPORTEDRATES_IE_ , &ie_len, @@ -1626,7 +1626,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) if(supportRateNum<=sizeof(supportRate)) { - _rtw_memcpy(supportRate+supportRateNum, p+2, ie_len); + memcpy(supportRate+supportRateNum, p+2, ie_len); supportRateNum += ie_len; } } @@ -1637,7 +1637,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) //update station supportRate pstat->bssratelen = supportRateNum; - _rtw_memcpy(pstat->bssrateset, supportRate, supportRateNum); + memcpy(pstat->bssrateset, supportRate, supportRateNum); UpdateBrateTblForSoftAP(pstat->bssrateset, pstat->bssratelen); //check RSN/WPA/WPS @@ -1780,7 +1780,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) if(copy_len>0) - _rtw_memcpy(pstat->wpa_ie, wpa_ie-2, copy_len); + memcpy(pstat->wpa_ie, wpa_ie-2, copy_len); } @@ -1859,7 +1859,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) pstat->flags |= WLAN_STA_WME; - _rtw_memcpy(&pstat->htpriv.ht_cap, elems.ht_capabilities, sizeof(struct rtw_ieee80211_ht_cap)); + memcpy(&pstat->htpriv.ht_cap, elems.ht_capabilities, sizeof(struct rtw_ieee80211_ht_cap)); } else pstat->flags &= ~WLAN_STA_HT; @@ -2018,7 +2018,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) pstat->passoc_req = rtw_zmalloc(pkt_len); if(pstat->passoc_req) { - _rtw_memcpy(pstat->passoc_req, pframe, pkt_len); + memcpy(pstat->passoc_req, pframe, pkt_len); pstat->assoc_req_len = pkt_len; } _exit_critical_bh(&pstat->lock, &irqL); @@ -2518,7 +2518,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra { case RTW_WLAN_ACTION_ADDBA_REQ: //ADDBA request - _rtw_memcpy(&(pmlmeinfo->ADDBA_req), &(frame_body[2]), sizeof(struct ADDBA_request)); + memcpy(&(pmlmeinfo->ADDBA_req), &(frame_body[2]), sizeof(struct ADDBA_request)); //process_addba_req(padapter, (u8*)&(pmlmeinfo->ADDBA_req), GetAddr3Ptr(pframe)); process_addba_req(padapter, (u8*)&(pmlmeinfo->ADDBA_req), addr); @@ -2669,9 +2669,9 @@ void issue_p2p_GO_request(struct adapter *padapter, 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++; @@ -2857,7 +2857,7 @@ void issue_p2p_GO_request(struct adapter *padapter, u8* raddr) p2pielen += 2; // Value: - _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); + memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); p2pielen += ETH_ALEN; @@ -2916,7 +2916,7 @@ void issue_p2p_GO_request(struct adapter *padapter, u8* raddr) // Value: // P2P Device Address - _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); + memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); p2pielen += ETH_ALEN; // Config Method @@ -2952,7 +2952,7 @@ void issue_p2p_GO_request(struct adapter *padapter, u8* raddr) 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; @@ -3057,9 +3057,9 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8* raddr, u8* frame 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++; @@ -3134,15 +3134,15 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8* raddr, u8* frame { 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 ); } } @@ -3297,7 +3297,7 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8* raddr, u8* frame p2pielen += 2; // Value: - _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); + memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); p2pielen += ETH_ALEN; // Channel List @@ -3353,7 +3353,7 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8* raddr, u8* frame // Value: // P2P Device Address - _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); + memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); p2pielen += ETH_ALEN; // Config Method @@ -3389,7 +3389,7 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8* raddr, u8* frame 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_GO) ) @@ -3404,11 +3404,11 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8* raddr, u8* frame // Value: // p2P Device Address - _rtw_memcpy( p2pie + p2pielen , pwdinfo->device_addr, ETH_ALEN ); + memcpy( p2pie + p2pielen , pwdinfo->device_addr, ETH_ALEN ); p2pielen += ETH_ALEN; // SSID - _rtw_memcpy( p2pie + p2pielen, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen ); + memcpy( p2pie + p2pielen, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen ); p2pielen += pwdinfo->nego_ssidlen; } @@ -3470,9 +3470,9 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8* raddr, u8 result) 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++; @@ -3672,11 +3672,11 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8* raddr, u8 result) // Value: // p2P Device Address - _rtw_memcpy( p2pie + p2pielen , pwdinfo->device_addr, ETH_ALEN ); + memcpy( p2pie + p2pielen , pwdinfo->device_addr, ETH_ALEN ); p2pielen += ETH_ALEN; // SSID - _rtw_memcpy( p2pie + p2pielen, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen ); + memcpy( p2pie + p2pielen, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen ); p2pielen += pwdinfo->nego_ssidlen; } @@ -3737,9 +3737,9 @@ void issue_p2p_invitation_request(struct adapter *padapter, 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, raddr, ETH_ALEN); + memcpy(pwlanhdr->addr1, raddr, ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, raddr, ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -3837,7 +3837,7 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8* raddr ) // Value: // P2P Device Address for GO - _rtw_memcpy( p2pie + p2pielen, pwdinfo->invitereq_info.go_bssid, ETH_ALEN ); + memcpy( p2pie + p2pielen, pwdinfo->invitereq_info.go_bssid, ETH_ALEN ); p2pielen += ETH_ALEN; } @@ -3893,11 +3893,11 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8* raddr ) // Value: // P2P Device Address for GO - _rtw_memcpy( p2pie + p2pielen, pwdinfo->invitereq_info.go_bssid, ETH_ALEN ); + memcpy( p2pie + p2pielen, pwdinfo->invitereq_info.go_bssid, ETH_ALEN ); p2pielen += ETH_ALEN; // SSID - _rtw_memcpy( p2pie + p2pielen, pwdinfo->invitereq_info.go_ssid, pwdinfo->invitereq_info.ssidlen ); + memcpy( p2pie + p2pielen, pwdinfo->invitereq_info.go_ssid, pwdinfo->invitereq_info.ssidlen ); p2pielen += pwdinfo->invitereq_info.ssidlen; @@ -3913,7 +3913,7 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8* raddr ) // Value: // P2P Device Address - _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); + memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); p2pielen += ETH_ALEN; // Config Method @@ -3947,7 +3947,7 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8* raddr ) 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; pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &pattrib->pktlen ); @@ -4009,9 +4009,9 @@ void issue_p2p_invitation_response(struct adapter *padapter, u8* raddr, u8 dialo 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, raddr, ETH_ALEN); + memcpy(pwlanhdr->addr1, raddr, ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, raddr, ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -4115,7 +4115,7 @@ void issue_p2p_invitation_response(struct adapter *padapter, u8* raddr, u8 dialo // Value: // P2P Device Address for GO - _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); + memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); p2pielen += ETH_ALEN; } @@ -4221,9 +4221,9 @@ void issue_p2p_provision_request(struct adapter *padapter, u8* pssid, u8 ussidle fctrl = &(pwlanhdr->frame_ctl); *(fctrl) = 0; - _rtw_memcpy(pwlanhdr->addr1, pdev_raddr, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, pdev_raddr, ETH_ALEN); + memcpy(pwlanhdr->addr1, pdev_raddr, ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, pdev_raddr, ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -4358,11 +4358,11 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) fctrl = &(pwlanhdr->frame_ctl); *(fctrl) = 0; - _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr2, mac, ETH_ALEN); + memcpy(pwlanhdr->addr1, da, ETH_ALEN); + memcpy(pwlanhdr->addr2, mac, ETH_ALEN); // Use the device address for BSSID field. - _rtw_memcpy(pwlanhdr->addr3, mac, ETH_ALEN); + memcpy(pwlanhdr->addr3, mac, ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -4377,7 +4377,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) pattrib->pktlen += 8; // beacon interval: 2 bytes - _rtw_memcpy(pframe, (unsigned char *) &beacon_interval, 2); + memcpy(pframe, (unsigned char *) &beacon_interval, 2); pframe += 2; pattrib->pktlen += 2; @@ -4386,7 +4386,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) capInfo |= cap_ShortPremble; capInfo |= cap_ShortSlot; - _rtw_memcpy(pframe, (unsigned char *) &capInfo, 2); + memcpy(pframe, (unsigned char *) &capInfo, 2); pframe += 2; pattrib->pktlen += 2; @@ -4407,12 +4407,12 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) if( pmlmepriv->wps_probe_resp_ie != NULL && pmlmepriv->p2p_probe_resp_ie != NULL ) { //WPS IE - _rtw_memcpy(pframe, pmlmepriv->wps_probe_resp_ie, pmlmepriv->wps_probe_resp_ie_len); + memcpy(pframe, pmlmepriv->wps_probe_resp_ie, pmlmepriv->wps_probe_resp_ie_len); pattrib->pktlen += pmlmepriv->wps_probe_resp_ie_len; pframe += pmlmepriv->wps_probe_resp_ie_len; //P2P IE - _rtw_memcpy(pframe, pmlmepriv->p2p_probe_resp_ie, pmlmepriv->p2p_probe_resp_ie_len); + memcpy(pframe, pmlmepriv->p2p_probe_resp_ie, pmlmepriv->p2p_probe_resp_ie_len); pattrib->pktlen += pmlmepriv->p2p_probe_resp_ie_len; pframe += pmlmepriv->p2p_probe_resp_ie_len; } @@ -4471,7 +4471,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) if( _rtw_memcmp(pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN) == false ) { // Vendor Extension - _rtw_memcpy( wpsie + wpsielen, pmlmepriv->sa_ext, L2SDTA_SERVICE_VE_LEN ); + memcpy( wpsie + wpsielen, pmlmepriv->sa_ext, L2SDTA_SERVICE_VE_LEN ); wpsielen += L2SDTA_SERVICE_VE_LEN; } } @@ -4513,9 +4513,9 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) // Value: if (pwdinfo->external_uuid == 0) { _rtw_memset( wpsie + wpsielen, 0x0, 16 ); - _rtw_memcpy( wpsie + wpsielen, myid( &padapter->eeprompriv ), ETH_ALEN ); + memcpy( wpsie + wpsielen, myid( &padapter->eeprompriv ), ETH_ALEN ); } else { - _rtw_memcpy( wpsie + wpsielen, pwdinfo->uuid, 0x10 ); + memcpy( wpsie + wpsielen, pwdinfo->uuid, 0x10 ); } wpsielen += 0x10; @@ -4529,7 +4529,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) wpsielen += 2; // Value: - _rtw_memcpy( wpsie + wpsielen, "Realtek", 7 ); + memcpy( wpsie + wpsielen, "Realtek", 7 ); wpsielen += 7; // Model Name @@ -4542,7 +4542,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) wpsielen += 2; // Value: - _rtw_memcpy( wpsie + wpsielen, "8192CU", 6 ); + memcpy( wpsie + wpsielen, "8192CU", 6 ); wpsielen += 6; // Model Number @@ -4567,7 +4567,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) wpsielen += 2; // Value: - _rtw_memcpy( wpsie + wpsielen, "123456" , ETH_ALEN ); + memcpy( wpsie + wpsielen, "123456" , ETH_ALEN ); wpsielen += ETH_ALEN; // Primary Device Type @@ -4604,7 +4604,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) // Value: if (pwdinfo->device_name_len) { - _rtw_memcpy( wpsie + wpsielen, pwdinfo->device_name, pwdinfo->device_name_len ); + memcpy( wpsie + wpsielen, pwdinfo->device_name, pwdinfo->device_name_len ); wpsielen += pwdinfo->device_name_len; } @@ -4643,7 +4643,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) else if (pmlmepriv->wfd_probe_resp_ie != NULL && pmlmepriv->wfd_probe_resp_ie_len>0) { //WFD IE - _rtw_memcpy(pframe, pmlmepriv->wfd_probe_resp_ie, pmlmepriv->wfd_probe_resp_ie_len); + memcpy(pframe, pmlmepriv->wfd_probe_resp_ie, pmlmepriv->wfd_probe_resp_ie_len); pattrib->pktlen += pmlmepriv->wfd_probe_resp_ie_len; pframe += pmlmepriv->wfd_probe_resp_ie_len; } @@ -4705,23 +4705,23 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) *(fctrl) = 0; if (da) { - _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, da, ETH_ALEN); + memcpy(pwlanhdr->addr1, da, ETH_ALEN); + memcpy(pwlanhdr->addr3, da, ETH_ALEN); } else { if ( ( pwdinfo->p2p_info.scan_op_ch_only ) || ( pwdinfo->rx_invitereq_info.scan_op_ch_only ) ) { // This two flags will be set when this is only the P2P client mode. - _rtw_memcpy(pwlanhdr->addr1, pwdinfo->p2p_peer_interface_addr, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, pwdinfo->p2p_peer_interface_addr, ETH_ALEN); + memcpy(pwlanhdr->addr1, pwdinfo->p2p_peer_interface_addr, ETH_ALEN); + memcpy(pwlanhdr->addr3, pwdinfo->p2p_peer_interface_addr, ETH_ALEN); } else { // broadcast probe request frame - _rtw_memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, bc_addr, ETH_ALEN); + memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); + memcpy(pwlanhdr->addr3, bc_addr, ETH_ALEN); } } - _rtw_memcpy(pwlanhdr->addr2, mac, ETH_ALEN); + memcpy(pwlanhdr->addr2, mac, ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -4747,12 +4747,12 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) if( pmlmepriv->wps_probe_req_ie != NULL && pmlmepriv->p2p_probe_req_ie != NULL ) { //WPS IE - _rtw_memcpy(pframe, pmlmepriv->wps_probe_req_ie, pmlmepriv->wps_probe_req_ie_len); + memcpy(pframe, pmlmepriv->wps_probe_req_ie, pmlmepriv->wps_probe_req_ie_len); pattrib->pktlen += pmlmepriv->wps_probe_req_ie_len; pframe += pmlmepriv->wps_probe_req_ie_len; //P2P IE - _rtw_memcpy(pframe, pmlmepriv->p2p_probe_req_ie, pmlmepriv->p2p_probe_req_ie_len); + memcpy(pframe, pmlmepriv->p2p_probe_req_ie, pmlmepriv->p2p_probe_req_ie_len); pattrib->pktlen += pmlmepriv->p2p_probe_req_ie_len; pframe += pmlmepriv->p2p_probe_req_ie_len; } @@ -4796,9 +4796,9 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) // Value: if (pwdinfo->external_uuid == 0) { _rtw_memset( wpsie + wpsielen, 0x0, 16 ); - _rtw_memcpy( wpsie + wpsielen, myid( &padapter->eeprompriv ), ETH_ALEN ); + memcpy( wpsie + wpsielen, myid( &padapter->eeprompriv ), ETH_ALEN ); } else { - _rtw_memcpy( wpsie + wpsielen, pwdinfo->uuid, 0x10 ); + memcpy( wpsie + wpsielen, pwdinfo->uuid, 0x10 ); } wpsielen += 0x10; @@ -4826,7 +4826,7 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) wpsielen += 2; // Value: - _rtw_memcpy( wpsie + wpsielen, pwdinfo->device_name, pwdinfo->device_name_len ); + memcpy( wpsie + wpsielen, pwdinfo->device_name, pwdinfo->device_name_len ); wpsielen += pwdinfo->device_name_len; // Primary Device Type @@ -4972,7 +4972,7 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) if( pmlmepriv->wps_probe_req_ie != NULL ) { //WPS IE - _rtw_memcpy(pframe, pmlmepriv->wps_probe_req_ie, pmlmepriv->wps_probe_req_ie_len); + memcpy(pframe, pmlmepriv->wps_probe_req_ie, pmlmepriv->wps_probe_req_ie_len); pattrib->pktlen += pmlmepriv->wps_probe_req_ie_len; pframe += pmlmepriv->wps_probe_req_ie_len; } @@ -4991,7 +4991,7 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) else if (pmlmepriv->wfd_probe_req_ie != NULL && pmlmepriv->wfd_probe_req_ie_len>0) { //WFD IE - _rtw_memcpy(pframe, pmlmepriv->wfd_probe_req_ie, pmlmepriv->wfd_probe_req_ie_len); + memcpy(pframe, pmlmepriv->wfd_probe_req_ie, pmlmepriv->wfd_probe_req_ie_len); pattrib->pktlen += pmlmepriv->wfd_probe_req_ie_len; pframe += pmlmepriv->wfd_probe_req_ie_len; } @@ -5164,7 +5164,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) // Commented by Kurt 20120113 // Get peer_dev_addr here if peer doesn't issue prov_disc frame. if( _rtw_memcmp(pwdinfo->rx_prov_disc_info.peerDevAddr, empty_addr, ETH_ALEN) ); - _rtw_memcpy(pwdinfo->rx_prov_disc_info.peerDevAddr, GetAddr2Ptr(pframe), ETH_ALEN); + memcpy(pwdinfo->rx_prov_disc_info.peerDevAddr, GetAddr2Ptr(pframe), ETH_ALEN); result = process_p2p_group_negotation_req( pwdinfo, frame_body, len ); issue_p2p_GO_response( padapter, GetAddr2Ptr(pframe), frame_body, len, result ); @@ -5353,7 +5353,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) { rtw_p2p_set_state(pwdinfo, P2P_STATE_RECV_INVITE_REQ_DISMATCH ); #ifdef CONFIG_INTEL_WIDI - _rtw_memcpy( pwdinfo->p2p_peer_device_addr, group_id.go_device_addr , ETH_ALEN ); + memcpy( pwdinfo->p2p_peer_device_addr, group_id.go_device_addr , ETH_ALEN ); rtw_p2p_set_role( pwdinfo, P2P_ROLE_CLIENT ); #endif //CONFIG_INTEL_WIDI @@ -5389,7 +5389,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) // The peer device address should be the destination address for the provisioning discovery request. // Then, this Wi-Fi device should use the iwpriv command to get the peer interface address. // The peer interface address should be the address for WPS mac address - _rtw_memcpy( pwdinfo->p2p_peer_device_addr, group_id.go_device_addr , ETH_ALEN ); + memcpy( pwdinfo->p2p_peer_device_addr, group_id.go_device_addr , ETH_ALEN ); rtw_p2p_set_role( pwdinfo, P2P_ROLE_CLIENT ); rtw_p2p_set_state(pwdinfo, P2P_STATE_RECV_INVITE_REQ_JOIN ); status_code = P2P_STATUS_SUCCESS; @@ -5491,7 +5491,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) case P2P_PROVISION_DISC_REQ: DBG_871X( "[%s] Got Provisioning Discovery Request Frame\n", __FUNCTION__ ); process_p2p_provdisc_req(pwdinfo, pframe, len); - _rtw_memcpy(pwdinfo->rx_prov_disc_info.peerDevAddr, GetAddr2Ptr(pframe), ETH_ALEN); + memcpy(pwdinfo->rx_prov_disc_info.peerDevAddr, GetAddr2Ptr(pframe), ETH_ALEN); //20110902 Kurt //Add the following statement to avoid receiving duplicate prov disc req. such that pre_p2p_state would be covered. @@ -5626,7 +5626,7 @@ unsigned int OnAction_sa_query(struct adapter *padapter, union recv_frame *precv switch (pframe[WLAN_HDR_A3_LEN+1]) { case 0: //SA Query req - _rtw_memcpy(&tid, &pframe[WLAN_HDR_A3_LEN+2], sizeof(unsigned short)); + memcpy(&tid, &pframe[WLAN_HDR_A3_LEN+2], sizeof(unsigned short)); DBG_871X("OnAction_sa_query request,action=%d, tid=%04x\n", pframe[WLAN_HDR_A3_LEN+1], tid); issue_action_SA_Query(padapter, GetAddr2Ptr(pframe), 1, tid); break; @@ -5948,7 +5948,7 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode) remain_len = ies_len -(next_ie-ies); ssid_ie[1] = 0; - _rtw_memcpy(ssid_ie+2, next_ie, remain_len); + memcpy(ssid_ie+2, next_ie, remain_len); len_diff -= ssid_len_ori; break; @@ -6011,9 +6011,9 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) fctrl = &(pwlanhdr->frame_ctl); *(fctrl) = 0; - _rtw_memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(cur_network), ETH_ALEN); + memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, get_my_bssid(cur_network), ETH_ALEN); SetSeqNum(pwlanhdr, 0/*pmlmeext->mgnt_seq*/); //pmlmeext->mgnt_seq++; @@ -6047,22 +6047,22 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) { if(pmlmepriv->wps_beacon_ie && pmlmepriv->wps_beacon_ie_len>0) { - _rtw_memcpy(pframe, cur_network->IEs, wps_offset); + memcpy(pframe, cur_network->IEs, wps_offset); pframe += wps_offset; pattrib->pktlen += wps_offset; - _rtw_memcpy(pframe, pmlmepriv->wps_beacon_ie, pmlmepriv->wps_beacon_ie_len); + memcpy(pframe, pmlmepriv->wps_beacon_ie, pmlmepriv->wps_beacon_ie_len); pframe += pmlmepriv->wps_beacon_ie_len; pattrib->pktlen += pmlmepriv->wps_beacon_ie_len; //copy remainder_ie to pframe - _rtw_memcpy(pframe, premainder_ie, remainder_ielen); + memcpy(pframe, premainder_ie, remainder_ielen); pframe += remainder_ielen; pattrib->pktlen += remainder_ielen; } else { - _rtw_memcpy(pframe, cur_network->IEs, cur_network->IELength); + memcpy(pframe, cur_network->IEs, cur_network->IELength); pframe += cur_network->IELength; pattrib->pktlen += cur_network->IELength; } @@ -6071,7 +6071,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) #endif //CONFIG_IOCTL_CFG80211 { pframe_wscie = pframe + wps_offset; - _rtw_memcpy(pframe, cur_network->IEs, wps_offset+wpsielen); + memcpy(pframe, cur_network->IEs, wps_offset+wpsielen); pframe += (wps_offset + wpsielen); pattrib->pktlen += (wps_offset + wpsielen); @@ -6109,7 +6109,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) insert_len += 2; // Value: - _rtw_memcpy( pframe + insert_len, pwdinfo->device_name, pwdinfo->device_name_len ); + memcpy( pframe + insert_len, pwdinfo->device_name, pwdinfo->device_name_len ); insert_len += pwdinfo->device_name_len; @@ -6121,7 +6121,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) pattrib->pktlen += insert_len; //copy remainder_ie to pframe - _rtw_memcpy(pframe, premainder_ie, remainder_ielen); + memcpy(pframe, premainder_ie, remainder_ielen); pframe += remainder_ielen; pattrib->pktlen += remainder_ielen; } @@ -6130,7 +6130,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) #endif //CONFIG_P2P { int len_diff; - _rtw_memcpy(pframe, cur_network->IEs, cur_network->IELength); + memcpy(pframe, cur_network->IEs, cur_network->IELength); len_diff = update_hidden_ssid( pframe+_BEACON_IE_OFFSET_ , cur_network->IELength-_BEACON_IE_OFFSET_ @@ -6164,7 +6164,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) { len = pmlmepriv->p2p_beacon_ie_len; if(pmlmepriv->p2p_beacon_ie && len>0) - _rtw_memcpy(pframe, pmlmepriv->p2p_beacon_ie, len); + memcpy(pframe, pmlmepriv->p2p_beacon_ie, len); } else #endif //CONFIG_IOCTL_CFG80211 @@ -6188,7 +6188,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) if(pmlmepriv->wfd_beacon_ie && pmlmepriv->wfd_beacon_ie_len>0) { len = pmlmepriv->wfd_beacon_ie_len; - _rtw_memcpy(pframe, pmlmepriv->wfd_beacon_ie, len); + memcpy(pframe, pmlmepriv->wfd_beacon_ie, len); } } #endif //CONFIG_IOCTL_CFG80211 @@ -6210,14 +6210,14 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) // beacon interval: 2 bytes - _rtw_memcpy(pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie(cur_network->IEs)), 2); + memcpy(pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie(cur_network->IEs)), 2); pframe += 2; pattrib->pktlen += 2; // capability info: 2 bytes - _rtw_memcpy(pframe, (unsigned char *)(rtw_get_capability_from_ie(cur_network->IEs)), 2); + memcpy(pframe, (unsigned char *)(rtw_get_capability_from_ie(cur_network->IEs)), 2); pframe += 2; pattrib->pktlen += 2; @@ -6327,9 +6327,9 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p fctrl = &(pwlanhdr->frame_ctl); *(fctrl) = 0; - _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr2, mac, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, bssid, ETH_ALEN); + memcpy(pwlanhdr->addr1, da, ETH_ALEN); + memcpy(pwlanhdr->addr2, mac, ETH_ALEN); + memcpy(pwlanhdr->addr3, bssid, ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -6360,28 +6360,28 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p remainder_ielen = cur_network->IELength - wps_offset - wps_ielen; - _rtw_memcpy(pframe, cur_network->IEs, wps_offset); + memcpy(pframe, cur_network->IEs, wps_offset); pframe += wps_offset; pattrib->pktlen += wps_offset; wps_ielen = (uint)pmlmepriv->wps_probe_resp_ie[1];//to get ie data len if((wps_offset+wps_ielen+2)<=MAX_IE_SZ) { - _rtw_memcpy(pframe, pmlmepriv->wps_probe_resp_ie, wps_ielen+2); + memcpy(pframe, pmlmepriv->wps_probe_resp_ie, wps_ielen+2); pframe += wps_ielen+2; pattrib->pktlen += wps_ielen+2; } if((wps_offset+wps_ielen+2+remainder_ielen)<=MAX_IE_SZ) { - _rtw_memcpy(pframe, premainder_ie, remainder_ielen); + memcpy(pframe, premainder_ie, remainder_ielen); pframe += remainder_ielen; pattrib->pktlen += remainder_ielen; } } else { - _rtw_memcpy(pframe, cur_network->IEs, cur_network->IELength); + memcpy(pframe, cur_network->IEs, cur_network->IELength); pframe += cur_network->IELength; pattrib->pktlen += cur_network->IELength; } @@ -6410,10 +6410,10 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p remainder_ielen = MAX_IE_SZ; } - _rtw_memcpy(buf, remainder_ie, remainder_ielen); - _rtw_memcpy(remainder_ie+ssid_ielen_diff, buf, remainder_ielen); + memcpy(buf, remainder_ie, remainder_ielen); + memcpy(remainder_ie+ssid_ielen_diff, buf, remainder_ielen); *(ssid_ie+1) = cur_network->Ssid.SsidLength; - _rtw_memcpy(ssid_ie+2, cur_network->Ssid.Ssid, cur_network->Ssid.SsidLength); + memcpy(ssid_ie+2, cur_network->Ssid.Ssid, cur_network->Ssid.SsidLength); pframe += ssid_ielen_diff; pattrib->pktlen += ssid_ielen_diff; @@ -6430,14 +6430,14 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p // beacon interval: 2 bytes - _rtw_memcpy(pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie(cur_network->IEs)), 2); + memcpy(pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie(cur_network->IEs)), 2); pframe += 2; pattrib->pktlen += 2; // capability info: 2 bytes - _rtw_memcpy(pframe, (unsigned char *)(rtw_get_capability_from_ie(cur_network->IEs)), 2); + memcpy(pframe, (unsigned char *)(rtw_get_capability_from_ie(cur_network->IEs)), 2); pframe += 2; pattrib->pktlen += 2; @@ -6489,7 +6489,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p //if pwdinfo->role == P2P_ROLE_DEVICE will call issue_probersp_p2p() len = pmlmepriv->p2p_go_probe_resp_ie_len; if(pmlmepriv->p2p_go_probe_resp_ie && len>0) - _rtw_memcpy(pframe, pmlmepriv->p2p_go_probe_resp_ie, len); + memcpy(pframe, pmlmepriv->p2p_go_probe_resp_ie, len); } else #endif //CONFIG_IOCTL_CFG80211 @@ -6514,7 +6514,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p if(pmlmepriv->wfd_probe_resp_ie && pmlmepriv->wfd_probe_resp_ie_len>0) { len = pmlmepriv->wfd_probe_resp_ie_len; - _rtw_memcpy(pframe, pmlmepriv->wfd_probe_resp_ie, len); + memcpy(pframe, pmlmepriv->wfd_probe_resp_ie, len); } } #endif //CONFIG_IOCTL_CFG80211 @@ -6577,17 +6577,17 @@ static int _issue_probereq(struct adapter *padapter, NDIS_802_11_SSID *pssid, u8 if (da) { // unicast probe request frame - _rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, da, ETH_ALEN); + memcpy(pwlanhdr->addr1, da, ETH_ALEN); + memcpy(pwlanhdr->addr3, da, ETH_ALEN); } else { // broadcast probe request frame - _rtw_memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, bc_addr, ETH_ALEN); + memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); + memcpy(pwlanhdr->addr3, bc_addr, ETH_ALEN); } - _rtw_memcpy(pwlanhdr->addr2, mac, ETH_ALEN); + memcpy(pwlanhdr->addr2, mac, ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -6616,7 +6616,7 @@ static int _issue_probereq(struct adapter *padapter, NDIS_802_11_SSID *pssid, u8 //add wps_ie for wps2.0 if(pmlmepriv->wps_probe_req_ie_len>0 && pmlmepriv->wps_probe_req_ie) { - _rtw_memcpy(pframe, pmlmepriv->wps_probe_req_ie, pmlmepriv->wps_probe_req_ie_len); + memcpy(pframe, pmlmepriv->wps_probe_req_ie, pmlmepriv->wps_probe_req_ie_len); pframe += pmlmepriv->wps_probe_req_ie_len; pattrib->pktlen += pmlmepriv->wps_probe_req_ie_len; //pmlmepriv->wps_probe_req_ie_len = 0 ;//reset to zero @@ -6901,7 +6901,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i //p = hostapd_eid_ht_capabilities_info(hapd, p); pbuf = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _HT_CAPABILITY_IE_, &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_)); if(pbuf && ie_len>0) { - _rtw_memcpy(pframe, pbuf, ie_len+2); + memcpy(pframe, pbuf, ie_len+2); pframe += (ie_len+2); pattrib->pktlen +=(ie_len+2); } @@ -6910,7 +6910,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i //p = hostapd_eid_ht_operation(hapd, p); pbuf = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_)); if(pbuf && ie_len>0) { - _rtw_memcpy(pframe, pbuf, ie_len+2); + memcpy(pframe, pbuf, ie_len+2); pframe += (ie_len+2); pattrib->pktlen +=(ie_len+2); } @@ -6926,7 +6926,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i for (pbuf = ie + _BEACON_IE_OFFSET_; ;pbuf+= (ie_len + 2)) { pbuf = rtw_get_ie(pbuf, _VENDOR_SPECIFIC_IE_, &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2))); if(pbuf && _rtw_memcmp(pbuf+2, WMM_PARA_IE, 6)) { - _rtw_memcpy(pframe, pbuf, ie_len+2); + memcpy(pframe, pbuf, ie_len+2); pframe += (ie_len+2); pattrib->pktlen +=(ie_len+2); @@ -6943,7 +6943,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i //add WPS IE ie for wps 2.0 if(pmlmepriv->wps_assoc_resp_ie && pmlmepriv->wps_assoc_resp_ie_len>0) { - _rtw_memcpy(pframe, pmlmepriv->wps_assoc_resp_ie, pmlmepriv->wps_assoc_resp_ie_len); + memcpy(pframe, pmlmepriv->wps_assoc_resp_ie, pmlmepriv->wps_assoc_resp_ie_len); pframe += pmlmepriv->wps_assoc_resp_ie_len; pattrib->pktlen += pmlmepriv->wps_assoc_resp_ie_len; @@ -7027,9 +7027,9 @@ void issue_assocreq(struct adapter *padapter) fctrl = &(pwlanhdr->frame_ctl); *(fctrl) = 0; - _rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), 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, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -7041,11 +7041,11 @@ void issue_assocreq(struct adapter *padapter) //caps #ifdef CONFIG_DFS - _rtw_memcpy(&cap, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2); + memcpy(&cap, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2); cap |= BIT(8); - _rtw_memcpy(pframe, &cap, 2); + memcpy(pframe, &cap, 2); #else - _rtw_memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2); + memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2); #endif //CONFIG_DFS pframe += 2; @@ -7054,7 +7054,7 @@ void issue_assocreq(struct adapter *padapter) //listen interval //todo: listen interval for power saving val16 = cpu_to_le16(3); - _rtw_memcpy(pframe ,(unsigned char *)&val16, 2); + memcpy(pframe ,(unsigned char *)&val16, 2); pframe += 2; pattrib->pktlen += 2; @@ -7134,7 +7134,7 @@ void issue_assocreq(struct adapter *padapter) if(padapter->mlmepriv.htpriv.ht_option==true) { p = rtw_get_ie((pmlmeinfo->network.IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_CAPABILITY_IE_, &ie_len, (pmlmeinfo->network.IELength - sizeof(NDIS_802_11_FIXED_IEs))); if (p && (!is_ap_in_tkip(padapter))) { - _rtw_memcpy(&(pmlmeinfo->HT_caps), (p + 2), sizeof(struct HT_caps_element)); + memcpy(&(pmlmeinfo->HT_caps), (p + 2), sizeof(struct HT_caps_element)); //to disable 40M Hz support while gd_bw_40MHz_en = 0 if (pregpriv->cbw40_enable == 0) @@ -7152,7 +7152,7 @@ void issue_assocreq(struct adapter *padapter) if(pregpriv->rx_stbc) pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |= cpu_to_le16(0x0100);//RX STBC One spatial stream - _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_1R, 16); + memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_1R, 16); break; case RF_2T2R: case RF_1T2R: @@ -7166,11 +7166,11 @@ void issue_assocreq(struct adapter *padapter) } #ifdef CONFIG_DISABLE_MCS13TO15 if(pmlmeext->cur_bwmode == HT_CHANNEL_WIDTH_40 && (pregpriv->wifi_spec!=1)) - _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R_MCS13TO15_OFF, 16); + memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R_MCS13TO15_OFF, 16); else - _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R, 16); + memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R, 16); #else //CONFIG_DISABLE_MCS13TO15 - _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R, 16); + memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R, 16); #endif //CONFIG_DISABLE_MCS13TO15 break; } @@ -7179,7 +7179,7 @@ void issue_assocreq(struct adapter *padapter) if(pregpriv->rx_stbc) pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |= cpu_to_le16(0x0100);//RX STBC One spatial stream - _rtw_memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_1R, 16); + memcpy(pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_1R, 16); } #endif @@ -7248,7 +7248,7 @@ void issue_assocreq(struct adapter *padapter) { if(pmlmepriv->p2p_assoc_req_ie && pmlmepriv->p2p_assoc_req_ie_len>0) { - _rtw_memcpy(pframe, pmlmepriv->p2p_assoc_req_ie, pmlmepriv->p2p_assoc_req_ie_len); + memcpy(pframe, pmlmepriv->p2p_assoc_req_ie, pmlmepriv->p2p_assoc_req_ie_len); pframe += pmlmepriv->p2p_assoc_req_ie_len; pattrib->pktlen += pmlmepriv->p2p_assoc_req_ie_len; } @@ -7322,7 +7322,7 @@ void issue_assocreq(struct adapter *padapter) // Value: // P2P Device Address - _rtw_memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); + memcpy( p2pie + p2pielen, myid( &padapter->eeprompriv ), ETH_ALEN ); p2pielen += ETH_ALEN; // Config Method @@ -7365,7 +7365,7 @@ void issue_assocreq(struct adapter *padapter) 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; // P2P Interface @@ -7377,12 +7377,12 @@ void issue_assocreq(struct adapter *padapter) p2pielen += 2; // Value: - _rtw_memcpy( p2pie + p2pielen, pwdinfo->device_addr, ETH_ALEN ); // P2P Device Address + memcpy( p2pie + p2pielen, pwdinfo->device_addr, ETH_ALEN ); // P2P Device Address p2pielen += ETH_ALEN; p2pie[ p2pielen++ ] = 1; // P2P Interface Address Count - _rtw_memcpy( p2pie + p2pielen, pwdinfo->device_addr, ETH_ALEN ); // P2P Interface Address List + memcpy( p2pie + p2pielen, pwdinfo->device_addr, ETH_ALEN ); // P2P Interface Address List p2pielen += ETH_ALEN; pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *) p2pie, &pattrib->pktlen ); @@ -7410,7 +7410,7 @@ void issue_assocreq(struct adapter *padapter) else if (pmlmepriv->wfd_assoc_req_ie != NULL && pmlmepriv->wfd_assoc_req_ie_len>0) { //WFD IE - _rtw_memcpy(pframe, pmlmepriv->wfd_assoc_req_ie, pmlmepriv->wfd_assoc_req_ie_len); + memcpy(pframe, pmlmepriv->wfd_assoc_req_ie, pmlmepriv->wfd_assoc_req_ie_len); pattrib->pktlen += pmlmepriv->wfd_assoc_req_ie_len; pframe += pmlmepriv->wfd_assoc_req_ie_len; } @@ -7485,9 +7485,9 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned SetPwrMgt(fctrl); } - _rtw_memcpy(pwlanhdr->addr1, da, 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, da, ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -7621,9 +7621,9 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 SetAckpolicy(qc, pattrib->ack_policy); - _rtw_memcpy(pwlanhdr->addr1, da, 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, da, ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -7741,9 +7741,9 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned s fctrl = &(pwlanhdr->frame_ctl); *(fctrl) = 0; - _rtw_memcpy(pwlanhdr->addr1, da, 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, da, ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -7853,9 +7853,9 @@ void issue_action_spct_ch_switch(struct adapter *padapter, u8 *ra, u8 new_ch, u8 fctrl = &(pwlanhdr->frame_ctl); *(fctrl) = 0; - _rtw_memcpy(pwlanhdr->addr1, ra, ETH_ALEN); /* RA */ - _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); /* TA */ - _rtw_memcpy(pwlanhdr->addr3, ra, ETH_ALEN); /* DA = RA */ + memcpy(pwlanhdr->addr1, ra, ETH_ALEN); /* RA */ + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); /* TA */ + memcpy(pwlanhdr->addr3, ra, ETH_ALEN); /* DA = RA */ SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -7923,11 +7923,11 @@ void issue_action_SA_Query(struct adapter *padapter, unsigned char *raddr, unsig *(fctrl) = 0; if(raddr) - _rtw_memcpy(pwlanhdr->addr1, raddr, ETH_ALEN); + memcpy(pwlanhdr->addr1, raddr, ETH_ALEN); else - _rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), 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, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -8008,10 +8008,10 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr, fctrl = &(pwlanhdr->frame_ctl); *(fctrl) = 0; - //_rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr1, raddr, 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, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); + memcpy(pwlanhdr->addr1, raddr, ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -8176,9 +8176,9 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) fctrl = &(pwlanhdr->frame_ctl); *(fctrl) = 0; - _rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), 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, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -8740,7 +8740,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLA //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); //get the signal strength //bssid->Rssi = precv_frame->u.hdr.attrib.SignalStrength; // 0-100 index. @@ -8766,7 +8766,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLA DBG_871X("%s()-%d: IE too long (%d) for survey event\n", __FUNCTION__, __LINE__, len); return _FAIL; } - _rtw_memcpy(bssid->Ssid.Ssid, (p + 2), *(p + 1)); + memcpy(bssid->Ssid.Ssid, (p + 2), *(p + 1)); bssid->Ssid.SsidLength = *(p + 1); } else @@ -8786,7 +8786,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLA DBG_871X("%s()-%d: IE too long (%d) for survey event\n", __FUNCTION__, __LINE__, len); return _FAIL; } - _rtw_memcpy(bssid->SupportedRates, (p + 2), len); + memcpy(bssid->SupportedRates, (p + 2), len); i = len; } @@ -8798,7 +8798,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLA DBG_871X("%s()-%d: IE too long (%d) for survey event\n", __FUNCTION__, __LINE__, len); return _FAIL; } - _rtw_memcpy(bssid->SupportedRates + i, (p + 2), len); + memcpy(bssid->SupportedRates + i, (p + 2), len); } //todo: @@ -8826,7 +8826,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLA // FIXME bssid->InfrastructureMode = Ndis802_11Infrastructure; - _rtw_memcpy(bssid->MacAddress, GetAddr2Ptr(pframe), ETH_ALEN); + memcpy(bssid->MacAddress, GetAddr2Ptr(pframe), ETH_ALEN); bssid->Privacy = 1; return _SUCCESS; } @@ -8857,17 +8857,17 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLA } } - _rtw_memcpy(&le_tmp, rtw_get_beacon_interval_from_ie(bssid->IEs), 2); + memcpy(&le_tmp, rtw_get_beacon_interval_from_ie(bssid->IEs), 2); bssid->Configuration.BeaconPeriod = le32_to_cpu(le_tmp); val16 = rtw_get_capability((WLAN_BSSID_EX *)bssid); if (val16 & BIT(0)) { bssid->InfrastructureMode = Ndis802_11Infrastructure; - _rtw_memcpy(bssid->MacAddress, GetAddr2Ptr(pframe), ETH_ALEN); + memcpy(bssid->MacAddress, GetAddr2Ptr(pframe), ETH_ALEN); } else { bssid->InfrastructureMode = Ndis802_11IBSS; - _rtw_memcpy(bssid->MacAddress, GetAddr3Ptr(pframe), ETH_ALEN); + memcpy(bssid->MacAddress, GetAddr3Ptr(pframe), ETH_ALEN); } if (val16 & BIT(4)) @@ -9201,7 +9201,7 @@ static void process_80211d(struct adapter *padapter, WLAN_BSSID_EX *bssid) ie += len; _rtw_memset(country, 0, 4); - _rtw_memcpy(country, p, 3); + memcpy(country, p, 3); p += 3; RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("%s: 802.11d country=%s\n", __FUNCTION__, country)); @@ -9234,7 +9234,7 @@ static void process_80211d(struct adapter *padapter, WLAN_BSSID_EX *bssid) DBG_871X("}\n"); #endif - _rtw_memcpy(chplan_sta, pmlmeext->channel_set, sizeof(chplan_sta)); + memcpy(chplan_sta, pmlmeext->channel_set, sizeof(chplan_sta)); #ifdef CONFIG_DEBUG_RTL871X i = 0; DBG_871X("%s: STA channel plan {", __func__); @@ -9590,7 +9590,7 @@ void report_join_res(struct adapter *padapter, int res) pc2h_evt_hdr->seq = ATOMIC_INC_RETURN(&pmlmeext->event_seq); pjoinbss_evt = (struct joinbss_event*)(pevtcmd + sizeof(struct C2HEvent_Header)); - _rtw_memcpy((unsigned char *)(&(pjoinbss_evt->network.network)), &(pmlmeinfo->network), sizeof(WLAN_BSSID_EX)); + memcpy((unsigned char *)(&(pjoinbss_evt->network.network)), &(pmlmeinfo->network), sizeof(WLAN_BSSID_EX)); pjoinbss_evt->network.join_res = pjoinbss_evt->network.aid = res; DBG_871X("report_join_res(%d)\n", res); @@ -9644,8 +9644,8 @@ void report_del_sta_event(struct adapter *padapter, unsigned char* MacAddr, unsi pc2h_evt_hdr->seq = ATOMIC_INC_RETURN(&pmlmeext->event_seq); pdel_sta_evt = (struct stadel_event*)(pevtcmd + sizeof(struct C2HEvent_Header)); - _rtw_memcpy((unsigned char *)(&(pdel_sta_evt->macaddr)), MacAddr, ETH_ALEN); - _rtw_memcpy((unsigned char *)(pdel_sta_evt->rsvd),(unsigned char *)(&reason),2); + memcpy((unsigned char *)(&(pdel_sta_evt->macaddr)), MacAddr, ETH_ALEN); + memcpy((unsigned char *)(pdel_sta_evt->rsvd),(unsigned char *)(&reason),2); psta = rtw_get_stainfo(&padapter->stapriv, MacAddr); @@ -9700,7 +9700,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char* MacAddr, int pc2h_evt_hdr->seq = ATOMIC_INC_RETURN(&pmlmeext->event_seq); padd_sta_evt = (struct stassoc_event*)(pevtcmd + sizeof(struct C2HEvent_Header)); - _rtw_memcpy((unsigned char *)(&(padd_sta_evt->macaddr)), MacAddr, ETH_ALEN); + memcpy((unsigned char *)(&(padd_sta_evt->macaddr)), MacAddr, ETH_ALEN); padd_sta_evt->cam_id = cam_idx; DBG_871X("report_add_sta_event: add STA\n"); @@ -10440,13 +10440,13 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) //clear CAM flush_all_cam_entry(padapter); - _rtw_memcpy(pnetwork, pbuf, FIELD_OFFSET(WLAN_BSSID_EX, IELength)); + memcpy(pnetwork, pbuf, FIELD_OFFSET(WLAN_BSSID_EX, IELength)); pnetwork->IELength = ((WLAN_BSSID_EX *)pbuf)->IELength; if(pnetwork->IELength>MAX_IE_SZ)//Check pbuf->IELength return H2C_PARAMETERS_ERROR; - _rtw_memcpy(pnetwork->IEs, ((WLAN_BSSID_EX *)pbuf)->IEs, pnetwork->IELength); + memcpy(pnetwork->IEs, ((WLAN_BSSID_EX *)pbuf)->IEs, pnetwork->IELength); start_create_ibss(padapter); @@ -10517,13 +10517,13 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) pmlmeinfo->bwmode_updated = false; //pmlmeinfo->assoc_AP_vendor = HT_IOT_PEER_MAX; - _rtw_memcpy(pnetwork, pbuf, FIELD_OFFSET(WLAN_BSSID_EX, IELength)); + memcpy(pnetwork, pbuf, FIELD_OFFSET(WLAN_BSSID_EX, IELength)); pnetwork->IELength = ((WLAN_BSSID_EX *)pbuf)->IELength; if(pnetwork->IELength>MAX_IE_SZ)//Check pbuf->IELength return H2C_PARAMETERS_ERROR; - _rtw_memcpy(pnetwork->IEs, ((WLAN_BSSID_EX *)pbuf)->IEs, pnetwork->IELength); + memcpy(pnetwork->IEs, ((WLAN_BSSID_EX *)pbuf)->IEs, pnetwork->IELength); pmlmeext->cur_channel = (u8)pnetwork->Configuration.DSConfig; pmlmeinfo->bcn_interval = get_beacon_interval(pnetwork); @@ -10689,7 +10689,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c && (set_idx=rtw_ch_set_search_ch(pmlmeext->channel_set, in[i].hw_value)) >=0 ) { - _rtw_memcpy(&out[j], &in[i], sizeof(struct rtw_ieee80211_channel)); + memcpy(&out[j], &in[i], sizeof(struct rtw_ieee80211_channel)); if(pmlmeext->channel_set[set_idx].ScanType == SCAN_PASSIVE) out[j].flags |= RTW_IEEE80211_CHAN_PASSIVE_SCAN; @@ -10723,7 +10723,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c } else if (padapter->setband == GHZ_50) { // 5G for (i=0; i < j ; i++) { if (out[i].hw_value > 35) { - _rtw_memcpy(&out[scan_ch_num++], &out[i], sizeof(struct rtw_ieee80211_channel)); + memcpy(&out[scan_ch_num++], &out[i], sizeof(struct rtw_ieee80211_channel)); } } j = scan_ch_num; @@ -10754,7 +10754,7 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf) for(i=0;issid[i].SsidLength) { - _rtw_memcpy(pmlmeext->sitesurvey_res.ssid[i].Ssid, pparm->ssid[i].Ssid, IW_ESSID_MAX_SIZE); + memcpy(pmlmeext->sitesurvey_res.ssid[i].Ssid, pparm->ssid[i].Ssid, IW_ESSID_MAX_SIZE); pmlmeext->sitesurvey_res.ssid[i].SsidLength= pparm->ssid[i].SsidLength; } else { pmlmeext->sitesurvey_res.ssid[i].SsidLength= 0; @@ -11037,7 +11037,7 @@ u8 set_tx_beacon_cmd(struct adapter* padapter) goto exit; } - _rtw_memcpy(&(ptxBeacon_parm->network), &(pmlmeinfo->network), sizeof(WLAN_BSSID_EX)); + memcpy(&(ptxBeacon_parm->network), &(pmlmeinfo->network), sizeof(WLAN_BSSID_EX)); len_diff = update_hidden_ssid( ptxBeacon_parm->network.IEs+_BEACON_IE_OFFSET_ diff --git a/core/rtw_p2p.c b/core/rtw_p2p.c index 1acabb9..5e0d847 100755 --- a/core/rtw_p2p.c +++ b/core/rtw_p2p.c @@ -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):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; diff --git a/core/rtw_recv.c b/core/rtw_recv.c index ab4aa04..16bb498 100755 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -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(ð_type, ptr, 2); + memcpy(ð_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, ð_type, 2); + memcpy(ptr+12, ð_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 */ diff --git a/core/rtw_security.c b/core/rtw_security.c index 5b90c39..438002a 100755 --- a/core/rtw_security.c +++ b/core/rtw_security.c @@ -203,8 +203,8 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe) for(curfragnum=0;curfragnumnr_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); diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index e5fdc1e..c6066b6 100755 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -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])); diff --git a/core/rtw_tdls.c b/core/rtw_tdls.c index f87770b..50d4005 100755 --- a/core/rtw_tdls.c +++ b/core/rtw_tdls.c @@ -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;kencrypt) - _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;kANonce, (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)); } diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index 6791f63..3589edf 100755 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -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); } diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index 6627f28..bd76293 100755 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -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, ðerhdr.h_dest, ETH_ALEN); - _rtw_memcpy(pattrib->src, ðerhdr.h_source, ETH_ALEN); + memcpy(pattrib->dst, ðerhdr.h_dest, ETH_ALEN); + memcpy(pattrib->src, ðerhdr.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 diff --git a/hal/hal_intf.c b/hal/hal_intf.c index cf73a68..ac83021 100755 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -274,7 +274,7 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe) pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - _rtw_memcpy(pmgntframe->attrib.ra, pwlanhdr->addr1, ETH_ALEN); + memcpy(pmgntframe->attrib.ra, pwlanhdr->addr1, ETH_ALEN); #ifdef CONFIG_IEEE80211W if(padapter->securitypriv.binstallBIPkey == true) diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index 047aa3e..70c894c 100755 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -121,12 +121,12 @@ static s32 FillH2CCmd_88E(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 if(CmdLen<=3) { - _rtw_memcpy((u8*)(&h2c_cmd)+1, pCmdBuffer, CmdLen ); + memcpy((u8*)(&h2c_cmd)+1, pCmdBuffer, CmdLen ); } else{ - _rtw_memcpy((u8*)(&h2c_cmd)+1, pCmdBuffer,3); + memcpy((u8*)(&h2c_cmd)+1, pCmdBuffer,3); ext_cmd_len = CmdLen-3; - _rtw_memcpy((u8*)(&h2c_cmd_ex), pCmdBuffer+3,ext_cmd_len ); + memcpy((u8*)(&h2c_cmd_ex), pCmdBuffer+3,ext_cmd_len ); //Write Ext command msgbox_ex_addr = REG_HMEBOX_EXT_0 + (h2c_box_num *RTL88E_EX_MESSAGE_BOX_SIZE); @@ -195,7 +195,7 @@ u8 rtl8188e_set_raid_cmd(struct adapter*padapter, u32 mask) _rtw_memset(buf, 0, 3); lmask = cpu_to_le32( mask ); - _rtw_memcpy(buf, &lmask, 3); + memcpy(buf, &lmask, 3); FillH2CCmd_88E(padapter, H2C_DM_MACID_CFG, 3, buf); }else{ @@ -364,9 +364,9 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength) fctrl = &(pwlanhdr->frame_ctl); *(fctrl) = 0; - _rtw_memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(cur_network), ETH_ALEN); + memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, get_my_bssid(cur_network), ETH_ALEN); SetSeqNum(pwlanhdr, 0/*pmlmeext->mgnt_seq*/); //pmlmeext->mgnt_seq++; @@ -380,13 +380,13 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength) pktlen += 8; // beacon interval: 2 bytes - _rtw_memcpy(pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie(cur_network->IEs)), 2); + memcpy(pframe, (unsigned char *)(rtw_get_beacon_interval_from_ie(cur_network->IEs)), 2); pframe += 2; pktlen += 2; // capability info: 2 bytes - _rtw_memcpy(pframe, (unsigned char *)(rtw_get_capability_from_ie(cur_network->IEs)), 2); + memcpy(pframe, (unsigned char *)(rtw_get_capability_from_ie(cur_network->IEs)), 2); pframe += 2; pktlen += 2; @@ -395,7 +395,7 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength) { //DBG_871X("ie len=%d\n", cur_network->IELength); pktlen += cur_network->IELength - sizeof(NDIS_802_11_FIXED_IEs); - _rtw_memcpy(pframe, cur_network->IEs+sizeof(NDIS_802_11_FIXED_IEs), pktlen); + memcpy(pframe, cur_network->IEs+sizeof(NDIS_802_11_FIXED_IEs), pktlen); goto _ConstructBeacon; } @@ -470,10 +470,10 @@ static void ConstructPSPoll(struct adapter *padapter, u8 *pframe, u32 *pLength) SetDuration(pframe, (pmlmeinfo->aid | 0xc000)); // BSSID. - _rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); + memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); // TA. - _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); *pLength = 16; } @@ -512,21 +512,21 @@ static void ConstructNullFunctionData( { case Ndis802_11Infrastructure: SetToDs(fctrl); - _rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, StaAddr, ETH_ALEN); + memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, StaAddr, ETH_ALEN); break; case Ndis802_11APMode: SetFrDs(fctrl); - _rtw_memcpy(pwlanhdr->addr1, StaAddr, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr2, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr1, StaAddr, ETH_ALEN); + memcpy(pwlanhdr->addr2, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); + memcpy(pwlanhdr->addr3, myid(&(padapter->eeprompriv)), ETH_ALEN); break; case Ndis802_11IBSS: default: - _rtw_memcpy(pwlanhdr->addr1, StaAddr, 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, StaAddr, ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); break; } @@ -589,9 +589,9 @@ static void ConstructARPResponse( SetFrameType(fctrl, WIFI_DATA); //SetFrameSubType(fctrl, 0); SetToDs(fctrl); - _rtw_memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), 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, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); SetSeqNum(pwlanhdr, 0); SetDuration(pwlanhdr, 0); @@ -645,7 +645,7 @@ static void ConstructARPResponse( //------------------------------------------------------------------------- pARPRspPkt = (u8*)(pframe+ *pLength); // LLC header - _rtw_memcpy(pARPRspPkt, ARPLLCHeader, 8); + memcpy(pARPRspPkt, ARPLLCHeader, 8); *pLength += 8; // ARP element @@ -702,7 +702,7 @@ static void ConstructARPResponse( rtw_secgetmic(&micdata,&(mic[0])); pARPRspPkt += 28; - _rtw_memcpy(pARPRspPkt, &(mic[0]),8); + memcpy(pARPRspPkt, &(mic[0]),8); *pLength += 8; } @@ -894,7 +894,7 @@ static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished) //3(8) sec IV rtw_get_sec_iv(padapter, cur_dot11txpn, get_my_bssid(&pmlmeinfo->network)); RsvdPageLoc.LocRemoteCtrlInfo = PageNum; - _rtw_memcpy(ReservedPagePacket+BufIndex-TxDescLen, cur_dot11txpn, 8); + memcpy(ReservedPagePacket+BufIndex-TxDescLen, cur_dot11txpn, 8); TotalPacketLen = BufIndex-TxDescLen + sizeof (union pn48); //IV len #else @@ -912,7 +912,7 @@ static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished) pattrib->pktlen = pattrib->last_txcmdsz = TotalPacketLen - TXDESC_OFFSET; if (TotalPacketLen < RTL88E_RSVDPAGE_SIZE) - _rtw_memcpy(pmgntframe->buf_addr, ReservedPagePacket, TotalPacketLen); + memcpy(pmgntframe->buf_addr, ReservedPagePacket, TotalPacketLen); else DBG_871X("%s: memory copy fail at Line: %d\n", __FUNCTION__, __LINE__); diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c index 660a36a..8d9f208 100755 --- a/hal/rtl8188e_hal_init.c +++ b/hal/rtl8188e_hal_init.c @@ -498,11 +498,11 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter,int data_len) if(rstatus){ fifo_data = rtw_read32(Adapter,REG_PKTBUF_DBG_DATA_L); //printk("fifo_data_144:0x%08x\n",fifo_data); - _rtw_memcpy(pbuf+(addr*8),&fifo_data , 4); + memcpy(pbuf+(addr*8),&fifo_data , 4); fifo_data = rtw_read32(Adapter,REG_PKTBUF_DBG_DATA_H); //printk("fifo_data_148:0x%08x\n",fifo_data); - _rtw_memcpy(pbuf+(addr*8+4), &fifo_data, 4); + memcpy(pbuf+(addr*8+4), &fifo_data, 4); } rtw_usleep_os(2); diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c index 767d340..7d24f09 100755 --- a/hal/rtl8188eu_xmit.c +++ b/hal/rtl8188eu_xmit.c @@ -1263,7 +1263,7 @@ s32 rtl8188eu_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt) // skb_put(pxmit_skb, len + TXDESC_SIZE); pxmitbuf = pxmitbuf + TXDESC_SIZE; - _rtw_memcpy(pxmitbuf, skb->data, len); + memcpy(pxmitbuf, skb->data, len); //DBG_8192C("mgnt_xmit, len=%x\n", pxmit_skb->len); diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index dd77dbb..191bdc2 100755 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -2084,7 +2084,7 @@ Hal_EfuseParseMACAddr_8188EU( else { //Read Permanent MAC address - _rtw_memcpy(pEEPROM->mac_addr, &hwinfo[EEPROM_MAC_ADDR_88EU], ETH_ALEN); + memcpy(pEEPROM->mac_addr, &hwinfo[EEPROM_MAC_ADDR_88EU], ETH_ALEN); } // NicIFSetMacAddress(pAdapter, pAdapter->PermanentAddress); diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c index 46122ab..967c523 100755 --- a/hal/usb_ops_linux.c +++ b/hal/usb_ops_linux.c @@ -100,7 +100,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u { pipe = usb_sndctrlpipe(udev, 0);//write_out reqtype = REALTEK_USB_VENQT_WRITE; - _rtw_memcpy( pIo_buf, pdata, len); + memcpy( pIo_buf, pdata, len); } status = rtw_usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT); @@ -110,7 +110,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u rtw_reset_continual_io_error(pdvobjpriv); if ( requesttype == 0x01 ) { // For Control read transfer, we have to copy the read data from pIo_buf to pdata. - _rtw_memcpy( pdata, pIo_buf, len ); + memcpy( pdata, pIo_buf, len ); } } else { // error cases @@ -135,7 +135,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u if (status > 0) { if ( requesttype == 0x01 ) { // For Control read transfer, we have to copy the read data from pIo_buf to pdata. - _rtw_memcpy( pdata, pIo_buf, len ); + memcpy( pdata, pIo_buf, len ); } } } @@ -314,7 +314,7 @@ static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata wvalue = (u16)(addr&0x0000ffff); len = length; - _rtw_memcpy(buf, pdata, len ); + memcpy(buf, pdata, len ); return usbctrl_vendorreq(pintfhdl, request, wvalue, index, buf, len, requesttype); } @@ -331,12 +331,12 @@ static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pb } // HISR - _rtw_memcpy(&(pHalData->IntArray[0]), &(pbuf[USB_INTR_CONTENT_HISR_OFFSET]), 4); - _rtw_memcpy(&(pHalData->IntArray[1]), &(pbuf[USB_INTR_CONTENT_HISRE_OFFSET]), 4); + memcpy(&(pHalData->IntArray[0]), &(pbuf[USB_INTR_CONTENT_HISR_OFFSET]), 4); + memcpy(&(pHalData->IntArray[1]), &(pbuf[USB_INTR_CONTENT_HISRE_OFFSET]), 4); #ifdef CONFIG_LPS_LCLK if ( pHalData->IntArray[0] & IMR_CPWM_88E ) { - _rtw_memcpy(&pwr_rpt.state, &(pbuf[USB_INTR_CONTENT_CPWM1_OFFSET]), 1); + memcpy(&pwr_rpt.state, &(pbuf[USB_INTR_CONTENT_CPWM1_OFFSET]), 1); //88e's cpwm value only change BIT0, so driver need to add PS_STATE_S2 for LPS flow. pwr_rpt.state |= PS_STATE_S2; @@ -376,7 +376,7 @@ static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pb // C2H Event if (pbuf[0]!= 0){ - _rtw_memcpy(&(pHalData->C2hArray[0]), &(pbuf[USB_INTR_CONTENT_C2H_OFFSET]), 16); + memcpy(&(pHalData->C2hArray[0]), &(pbuf[USB_INTR_CONTENT_C2H_OFFSET]), 16); //rtw_c2h_wk_cmd(padapter); to do.. } @@ -591,7 +591,7 @@ static int recvbuf2recvframe(struct adapter *padapter, struct recv_buf *precvbuf precvframe->u.hdr.rx_end = pkt_copy->data + alloc_sz; skb_reserve( pkt_copy, 8 - ((SIZE_PTR)( pkt_copy->data ) & 7 ));//force pkt_copy->data at 8-byte alignment address skb_reserve( pkt_copy, shift_sz );//force ip_hdr at 8-byte alignment address according to shift_sz. - _rtw_memcpy(pkt_copy->data, (pbuf + pattrib->drvinfo_sz + RXDESC_SIZE), skb_len); + memcpy(pkt_copy->data, (pbuf + pattrib->drvinfo_sz + RXDESC_SIZE), skb_len); precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pkt_copy->data; } else @@ -966,7 +966,7 @@ static int recvbuf2recvframe(struct adapter *padapter, _pkt *pskb) precvframe->u.hdr.rx_end = pkt_copy->data + alloc_sz; skb_reserve( pkt_copy, 8 - ((SIZE_PTR)( pkt_copy->data ) & 7 ));//force pkt_copy->data at 8-byte alignment address skb_reserve( pkt_copy, shift_sz );//force ip_hdr at 8-byte alignment address according to shift_sz. - _rtw_memcpy(pkt_copy->data, (pbuf + pattrib->drvinfo_sz + RXDESC_SIZE), skb_len); + memcpy(pkt_copy->data, (pbuf + pattrib->drvinfo_sz + RXDESC_SIZE), skb_len); precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pkt_copy->data; } else diff --git a/include/osdep_service.h b/include/osdep_service.h index 63ad4e2..e031691 100755 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -573,7 +573,6 @@ static inline void _rtw_spinunlock_ex(_lock *plock) void* rtw_malloc2d(int h, int w, int size); void rtw_mfree2d(void *pbuf, int h, int w, int size); -void _rtw_memcpy(void* dec, void* sour, u32 sz); int _rtw_memcmp(void *dst, void *src, u32 sz); void _rtw_memset(void *pbuf, int c, u32 sz); diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c index b5d2944..73e8f4d 100755 --- a/os_dep/ioctl_cfg80211.c +++ b/os_dep/ioctl_cfg80211.c @@ -163,28 +163,28 @@ static struct ieee80211_channel rtw_5ghz_a_channels[] = { static void rtw_2g_channels_init(struct ieee80211_channel *channels) { - _rtw_memcpy((void*)channels, (void*)rtw_2ghz_channels, + memcpy((void*)channels, (void*)rtw_2ghz_channels, sizeof(struct ieee80211_channel)*RTW_2G_CHANNELS_NUM ); } static void rtw_5g_channels_init(struct ieee80211_channel *channels) { - _rtw_memcpy((void*)channels, (void*)rtw_5ghz_a_channels, + memcpy((void*)channels, (void*)rtw_5ghz_a_channels, sizeof(struct ieee80211_channel)*RTW_5G_CHANNELS_NUM ); } static void rtw_2g_rates_init(struct ieee80211_rate *rates) { - _rtw_memcpy(rates, rtw_g_rates, + memcpy(rates, rtw_g_rates, sizeof(struct ieee80211_rate)*RTW_G_RATES_NUM ); } static void rtw_5g_rates_init(struct ieee80211_rate *rates) { - _rtw_memcpy(rates, rtw_a_rates, + memcpy(rates, rtw_a_rates, sizeof(struct ieee80211_rate)*RTW_A_RATES_NUM ); } @@ -446,21 +446,21 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl //pmlmeext->mgnt_seq++; if (pnetwork->network.Reserved[0] == 1) { // WIFI_BEACON - _rtw_memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); + memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN); SetFrameSubType(pbuf, WIFI_BEACON); } else { - _rtw_memcpy(pwlanhdr->addr1, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr1, myid(&(padapter->eeprompriv)), ETH_ALEN); SetFrameSubType(pbuf, WIFI_PROBERSP); } - _rtw_memcpy(pwlanhdr->addr2, pnetwork->network.MacAddress, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, pnetwork->network.MacAddress, ETH_ALEN); + memcpy(pwlanhdr->addr2, pnetwork->network.MacAddress, ETH_ALEN); + memcpy(pwlanhdr->addr3, pnetwork->network.MacAddress, ETH_ALEN); pbuf += sizeof(struct rtw_ieee80211_hdr_3addr); len = sizeof (struct rtw_ieee80211_hdr_3addr); - _rtw_memcpy(pbuf, pnetwork->network.IEs, pnetwork->network.IELength); + memcpy(pbuf, pnetwork->network.IEs, pnetwork->network.IELength); len += pnetwork->network.IELength; //#ifdef CONFIG_P2P @@ -583,7 +583,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) if(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==true) { - _rtw_memcpy(&cur_network->network, pnetwork, sizeof(WLAN_BSSID_EX)); + memcpy(&cur_network->network, pnetwork, sizeof(WLAN_BSSID_EX)); if(cur_network) { if (!rtw_cfg80211_inform_bss(padapter,cur_network)) @@ -813,9 +813,9 @@ static u8 set_pairwise_key(struct adapter *padapter, struct sta_info *psta) psetstakey_para->algorithm = (u8)psta->dot118021XPrivacy; - _rtw_memcpy(psetstakey_para->addr, psta->hwaddr, ETH_ALEN); + memcpy(psetstakey_para->addr, psta->hwaddr, ETH_ALEN); - _rtw_memcpy(psetstakey_para->key, &psta->dot118021x_UncstKey, 16); + memcpy(psetstakey_para->key, &psta->dot118021x_UncstKey, 16); res = rtw_enqueue_cmd(pcmdpriv, ph2c); @@ -874,7 +874,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid) keylen = 16; } - _rtw_memcpy(&(psetkeyparm->key[0]), key, keylen); + memcpy(&(psetkeyparm->key[0]), key, keylen); pcmd->cmdcode = _SetKey_CMD_; pcmd->parmbuf = (u8 *)psetkeyparm; @@ -1005,7 +1005,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx; } - _rtw_memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), param->u.crypt.key, wep_key_len); + memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), param->u.crypt.key, wep_key_len); psecuritypriv->dot11DefKeylen[wep_key_idx] = wep_key_len; @@ -1024,7 +1024,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa { DBG_8192C("%s, set group_key, WEP\n", __FUNCTION__); - _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); psecuritypriv->dot118021XGrpPrivacy = _WEP40_; if(param->u.crypt.key_len==13) @@ -1039,12 +1039,12 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psecuritypriv->dot118021XGrpPrivacy = _TKIP_; - _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); //DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); //set mic key - _rtw_memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); - _rtw_memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); + memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); + memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); psecuritypriv->busetkipkey = true; @@ -1055,7 +1055,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psecuritypriv->dot118021XGrpPrivacy = _AES_; - _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); } else { @@ -1091,7 +1091,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa { if(param->u.crypt.set_tx ==1) //pairwise key { - _rtw_memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); if(strcmp(param->u.crypt.alg, "WEP") == 0) { @@ -1111,8 +1111,8 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa //DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); //set mic key - _rtw_memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); - _rtw_memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); + memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); + memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); psecuritypriv->busetkipkey = true; @@ -1142,7 +1142,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa { if(strcmp(param->u.crypt.alg, "WEP") == 0) { - _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); psecuritypriv->dot118021XGrpPrivacy = _WEP40_; if(param->u.crypt.key_len==13) @@ -1154,12 +1154,12 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa { psecuritypriv->dot118021XGrpPrivacy = _TKIP_; - _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); //DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); //set mic key - _rtw_memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); - _rtw_memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); + memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); + memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); psecuritypriv->busetkipkey = true; @@ -1168,7 +1168,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa { psecuritypriv->dot118021XGrpPrivacy = _AES_; - _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); } else { @@ -1283,7 +1283,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx; } - _rtw_memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), param->u.crypt.key, wep_key_len); + memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), param->u.crypt.key, wep_key_len); psecuritypriv->dot11DefKeylen[wep_key_idx] = wep_key_len; @@ -1324,13 +1324,13 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param DBG_8192C("%s, : param->u.crypt.set_tx ==1 \n", __func__); - _rtw_memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); if(strcmp(param->u.crypt.alg, "TKIP") == 0)//set mic key { //DEBUG_ERR(("\nset key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); - _rtw_memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); - _rtw_memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); + memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); + memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); padapter->securitypriv.busetkipkey=false; //_set_timer(&padapter->securitypriv.tkip_timer, 50); @@ -1345,9 +1345,9 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param { if(strcmp(param->u.crypt.alg, "TKIP") == 0 || strcmp(param->u.crypt.alg, "CCMP") == 0) { - _rtw_memcpy(padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); - _rtw_memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[16]),8); - _rtw_memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[24]),8); + memcpy(padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[16]),8); + memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[24]),8); padapter->securitypriv.binstallGrpkey = true; //DEBUG_ERR((" param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); DBG_871X(" ~~~~set sta key:groupkey\n"); @@ -1361,7 +1361,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param int no; //DBG_871X("BIP key_len=%d , index=%d @@@@@@@@@@@@@@@@@@\n", param->u.crypt.key_len, param->u.crypt.idx); //save the IGTK key, length 16 bytes - _rtw_memcpy(padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); /*DBG_871X("IGTK key below:\n"); for(no=0;no<16;no++) printk(" %02x ", padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey[no]); @@ -1422,19 +1422,19 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param list_for_each_entry(pWapiSta, &pWapiInfo->wapiSTAUsedList, list) { if(_rtw_memcmp(pWapiSta->PeerMacAddr,param->sta_addr,6)) { - _rtw_memcpy(pWapiSta->lastTxUnicastPN,WapiASUEPNInitialValueSrc,16); + memcpy(pWapiSta->lastTxUnicastPN,WapiASUEPNInitialValueSrc,16); pWapiSta->wapiUsk.bSet = true; - _rtw_memcpy(pWapiSta->wapiUsk.dataKey,param->u.crypt.key,16); - _rtw_memcpy(pWapiSta->wapiUsk.micKey,param->u.crypt.key+16,16); + memcpy(pWapiSta->wapiUsk.dataKey,param->u.crypt.key,16); + memcpy(pWapiSta->wapiUsk.micKey,param->u.crypt.key+16,16); pWapiSta->wapiUsk.keyId = param->u.crypt.idx ; pWapiSta->wapiUsk.bTxEnable = true; - _rtw_memcpy(pWapiSta->lastRxUnicastPNBEQueue,WapiAEPNInitialValueSrc,16); - _rtw_memcpy(pWapiSta->lastRxUnicastPNBKQueue,WapiAEPNInitialValueSrc,16); - _rtw_memcpy(pWapiSta->lastRxUnicastPNVIQueue,WapiAEPNInitialValueSrc,16); - _rtw_memcpy(pWapiSta->lastRxUnicastPNVOQueue,WapiAEPNInitialValueSrc,16); - _rtw_memcpy(pWapiSta->lastRxUnicastPN,WapiAEPNInitialValueSrc,16); + memcpy(pWapiSta->lastRxUnicastPNBEQueue,WapiAEPNInitialValueSrc,16); + memcpy(pWapiSta->lastRxUnicastPNBKQueue,WapiAEPNInitialValueSrc,16); + memcpy(pWapiSta->lastRxUnicastPNVIQueue,WapiAEPNInitialValueSrc,16); + memcpy(pWapiSta->lastRxUnicastPNVOQueue,WapiAEPNInitialValueSrc,16); + memcpy(pWapiSta->lastRxUnicastPN,WapiAEPNInitialValueSrc,16); pWapiSta->wapiUskUpdate.bTxEnable = false; pWapiSta->wapiUskUpdate.bSet = false; @@ -1452,15 +1452,15 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param if(_rtw_memcmp(pWapiSta->PeerMacAddr,get_bssid(pmlmepriv),6)) { pWapiSta->wapiMsk.bSet = true; - _rtw_memcpy(pWapiSta->wapiMsk.dataKey,param->u.crypt.key,16); - _rtw_memcpy(pWapiSta->wapiMsk.micKey,param->u.crypt.key+16,16); + memcpy(pWapiSta->wapiMsk.dataKey,param->u.crypt.key,16); + memcpy(pWapiSta->wapiMsk.micKey,param->u.crypt.key+16,16); pWapiSta->wapiMsk.keyId = param->u.crypt.idx ; pWapiSta->wapiMsk.bTxEnable = false; if(!pWapiSta->bSetkeyOk) pWapiSta->bSetkeyOk = true; pWapiSta->bAuthenticateInProgress = false; - _rtw_memcpy(pWapiSta->lastRxMulticastPN, WapiAEMultiCastPNInitialValueSrc, 16); + memcpy(pWapiSta->lastRxMulticastPN, WapiAEMultiCastPNInitialValueSrc, 16); if (psecuritypriv->sw_decrypt == false) { @@ -1548,7 +1548,7 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, ret = -ENOTSUPP; goto addkey_end; } - _rtw_memcpy((void*)param->sta_addr, (void*)mac_addr, ETH_ALEN); + memcpy((void*)param->sta_addr, (void*)mac_addr, ETH_ALEN); } else { DBG_871X("mac_addr is null \n"); } @@ -1577,13 +1577,13 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, if (params->seq_len && params->seq) { - _rtw_memcpy(param->u.crypt.seq, (void *)params->seq, params->seq_len); + memcpy(param->u.crypt.seq, (void *)params->seq, params->seq_len); } if(params->key_len && params->key) { param->u.crypt.key_len = params->key_len; - _rtw_memcpy(param->u.crypt.key, (void *)params->key, params->key_len); + memcpy(param->u.crypt.key, (void *)params->key, params->key_len); } if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) @@ -1594,7 +1594,7 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, { #ifdef CONFIG_AP_MODE if(mac_addr) - _rtw_memcpy(param->sta_addr, (void*)mac_addr, ETH_ALEN); + memcpy(param->sta_addr, (void*)mac_addr, ETH_ALEN); ret = rtw_cfg80211_ap_set_encryption(ndev, param, param_len); #endif @@ -2013,7 +2013,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct adapter *padapter, char *b return -EINVAL; } - _rtw_memcpy(pmlmepriv->wps_probe_req_ie, wps_ie, wps_ielen); + memcpy(pmlmepriv->wps_probe_req_ie, wps_ie, wps_ielen); pmlmepriv->wps_probe_req_ie_len = wps_ielen; } @@ -2045,7 +2045,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct adapter *padapter, char *b return -EINVAL; } - _rtw_memcpy(pmlmepriv->p2p_probe_req_ie, p2p_ie, p2p_ielen); + memcpy(pmlmepriv->p2p_probe_req_ie, p2p_ie, p2p_ielen); pmlmepriv->p2p_probe_req_ie_len = p2p_ielen; if(rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_LISTEN_CH, (u8*)listen_ch_attr, (uint*) &attr_contentlen) @@ -2239,7 +2239,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy #ifdef CONFIG_DEBUG_CFG80211 DBG_8192C("ssid=%s, len=%d\n", ssids[i].ssid, ssids[i].ssid_len); #endif - _rtw_memcpy(ssid[i].Ssid, ssids[i].ssid, ssids[i].ssid_len); + memcpy(ssid[i].Ssid, ssids[i].ssid, ssids[i].ssid_len); ssid[i].SsidLength = ssids[i].ssid_len; } @@ -2256,13 +2256,13 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy _enter_critical_bh(&pmlmepriv->lock, &irqL); if (request->n_channels == 1) { for(i=1;in_channels <= 4) { for(j=request->n_channels-1;j>=0;j--) for(i=0;in_channels); } else { @@ -2483,7 +2483,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel goto exit; } - _rtw_memcpy(buf, pie , ielen); + memcpy(buf, pie , ielen); //dump { @@ -2507,7 +2507,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel { padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_8021X; padapter->securitypriv.ndisauthtype=Ndis802_11AuthModeWPAPSK; - _rtw_memcpy(padapter->securitypriv.supplicant_ie, &pwpa[0], wpa_ielen+2); + memcpy(padapter->securitypriv.supplicant_ie, &pwpa[0], wpa_ielen+2); DBG_8192C("got wpa_ie, wpa_ielen:%u\n", wpa_ielen); } @@ -2520,7 +2520,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel { padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_8021X; padapter->securitypriv.ndisauthtype=Ndis802_11AuthModeWPA2PSK; - _rtw_memcpy(padapter->securitypriv.supplicant_ie, &pwpa2[0], wpa2_ielen+2); + memcpy(padapter->securitypriv.supplicant_ie, &pwpa2[0], wpa2_ielen+2); DBG_8192C("got wpa2_ie, wpa2_ielen:%u\n", wpa2_ielen); } @@ -2591,7 +2591,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel if (wps_ie && wps_ielen > 0) { DBG_8192C("got wps_ie, wps_ielen:%u\n", wps_ielen); padapter->securitypriv.wps_ie_len = wps_ielensecuritypriv.wps_ie, wps_ie, padapter->securitypriv.wps_ie_len); + memcpy(padapter->securitypriv.wps_ie, wps_ie, padapter->securitypriv.wps_ie_len); set_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS); } else { _clr_fwstate_(&padapter->mlmepriv, WIFI_UNDER_WPS); @@ -2623,7 +2623,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); goto exit; } - _rtw_memcpy(pmlmepriv->p2p_assoc_req_ie, p2p_ie, p2p_ielen); + memcpy(pmlmepriv->p2p_assoc_req_ie, p2p_ie, p2p_ielen); pmlmepriv->p2p_assoc_req_ie_len = p2p_ielen; } } @@ -2712,7 +2712,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev, _rtw_memset(&ndis_ssid, 0, sizeof(NDIS_802_11_SSID)); ndis_ssid.SsidLength = params->ssid_len; - _rtw_memcpy(ndis_ssid.Ssid, (void *)params->ssid, params->ssid_len); + memcpy(ndis_ssid.Ssid, (void *)params->ssid, params->ssid_len); //DBG_8192C("ssid=%s, len=%zu\n", ndis_ssid.Ssid, params->ssid_len); @@ -2814,7 +2814,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, _rtw_memset(&ndis_ssid, 0, sizeof(NDIS_802_11_SSID)); ndis_ssid.SsidLength = sme->ssid_len; - _rtw_memcpy(ndis_ssid.Ssid, (void *)sme->ssid, sme->ssid_len); + memcpy(ndis_ssid.Ssid, (void *)sme->ssid, sme->ssid_len); DBG_8192C("ssid=%s, len=%zu\n", ndis_ssid.Ssid, sme->ssid_len); @@ -2925,7 +2925,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, pwep->KeyIndex = wep_key_idx; pwep->KeyIndex |= 0x80000000; - _rtw_memcpy(pwep->KeyMaterial, (void *)sme->key, pwep->KeyLength); + memcpy(pwep->KeyMaterial, (void *)sme->key, pwep->KeyLength); if(rtw_set_802_11_add_wep(padapter, pwep) == (u8)_FAIL) { @@ -3085,7 +3085,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy, { // BSSID is matched, the same AP => rewrite with new PMKID. DBG_871X(FUNC_NDEV_FMT" BSSID exists in the PMKList.\n", FUNC_NDEV_ARG(netdev)); - _rtw_memcpy( psecuritypriv->PMKIDList[index].PMKID, (void *)pmksa->pmkid, WLAN_PMKID_LEN); + memcpy( psecuritypriv->PMKIDList[index].PMKID, (void *)pmksa->pmkid, WLAN_PMKID_LEN); psecuritypriv->PMKIDList[index].bUsed = true; psecuritypriv->PMKIDIndex = index+1; blInserted = true; @@ -3099,8 +3099,8 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy, DBG_871X(FUNC_NDEV_FMT" Use the new entry index = %d for this PMKID.\n", FUNC_NDEV_ARG(netdev), psecuritypriv->PMKIDIndex ); - _rtw_memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, (void *)pmksa->bssid, ETH_ALEN); - _rtw_memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].PMKID, (void *)pmksa->pmkid, WLAN_PMKID_LEN); + memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, (void *)pmksa->bssid, ETH_ALEN); + memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].PMKID, (void *)pmksa->pmkid, WLAN_PMKID_LEN); psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].bUsed = true; psecuritypriv->PMKIDIndex++ ; @@ -3245,11 +3245,11 @@ void rtw_cfg80211_indicate_sta_disassoc(struct adapter *padapter, unsigned char fctrl = &(pwlanhdr->frame_ctl); *(fctrl) = 0; - //_rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN); - //_rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr1, myid(&(padapter->eeprompriv)), ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr2, da, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); + //memcpy(pwlanhdr->addr1, da, ETH_ALEN); + //memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr1, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr2, da, ETH_ALEN); + memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -3412,7 +3412,7 @@ dump: pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; - _rtw_memcpy(pframe, (void*)buf, len); + memcpy(pframe, (void*)buf, len); #ifdef CONFIG_WFD if (type >= 0) { @@ -3545,7 +3545,7 @@ static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str } *ndev = pwdev_priv->pmon_ndev = mon_ndev; - _rtw_memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1); + memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1); out: if (ret && mon_wdev) { @@ -3681,14 +3681,14 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_l return -ENOMEM; - //_rtw_memcpy(&pstapriv->max_num_sta, param->u.bcn_ie.reserved, 2); + //memcpy(&pstapriv->max_num_sta, param->u.bcn_ie.reserved, 2); //if((pstapriv->max_num_sta>NUM_STA) || (pstapriv->max_num_sta<=0)) // pstapriv->max_num_sta = NUM_STA; - _rtw_memcpy(pbuf, (void *)head+24, head_len-24);// 24=beacon header len. - _rtw_memcpy(pbuf+head_len-24, (void *)tail, tail_len); + memcpy(pbuf, (void *)head+24, head_len-24);// 24=beacon header len. + memcpy(pbuf+head_len-24, (void *)tail, tail_len); len = head_len+tail_len-24; @@ -3808,9 +3808,9 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev, WLAN_BSSID_EX *pbss_network = &adapter->mlmepriv.cur_network.network; WLAN_BSSID_EX *pbss_network_ext = &adapter->mlmeextpriv.mlmext_info.network; - _rtw_memcpy(pbss_network->Ssid.Ssid, (void *)settings->ssid, settings->ssid_len); + memcpy(pbss_network->Ssid.Ssid, (void *)settings->ssid, settings->ssid_len); pbss_network->Ssid.SsidLength = settings->ssid_len; - _rtw_memcpy(pbss_network_ext->Ssid.Ssid, (void *)settings->ssid, settings->ssid_len); + memcpy(pbss_network_ext->Ssid.Ssid, (void *)settings->ssid, settings->ssid_len); pbss_network_ext->Ssid.SsidLength = settings->ssid_len; } @@ -4171,8 +4171,8 @@ void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter, const u8 DBG_871X( "[%s] In\n", __FUNCTION__ ); //prepare for building provision_request frame - _rtw_memcpy(pwdinfo->tx_prov_disc_info.peerIFAddr, GetAddr1Ptr(buf), ETH_ALEN); - _rtw_memcpy(pwdinfo->tx_prov_disc_info.peerDevAddr, GetAddr1Ptr(buf), ETH_ALEN); + memcpy(pwdinfo->tx_prov_disc_info.peerIFAddr, GetAddr1Ptr(buf), ETH_ALEN); + memcpy(pwdinfo->tx_prov_disc_info.peerDevAddr, GetAddr1Ptr(buf), ETH_ALEN); pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_PUSH_BUTTON; @@ -4230,9 +4230,9 @@ void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter, const u8 fctrl = &(pwlanhdr->frame_ctl); *(fctrl) = 0; - _rtw_memcpy(pwlanhdr->addr1, pwdinfo->tx_prov_disc_info.peerDevAddr, ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); - _rtw_memcpy(pwlanhdr->addr3, pwdinfo->tx_prov_disc_info.peerDevAddr, ETH_ALEN); + memcpy(pwlanhdr->addr1, pwdinfo->tx_prov_disc_info.peerDevAddr, ETH_ALEN); + memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN); + memcpy(pwlanhdr->addr3, pwdinfo->tx_prov_disc_info.peerDevAddr, ETH_ALEN); SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; @@ -4274,7 +4274,7 @@ void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter, const u8 // Value: // Device Capability Bitmap, 1 byte // Group Capability Bitmap, 1 byte - _rtw_memcpy(p2p_ie + p2pielen, &capability, 2); + memcpy(p2p_ie + p2pielen, &capability, 2); p2pielen += 2; @@ -4290,7 +4290,7 @@ void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter, const u8 p2pielen += 2; // Value: - _rtw_memcpy(p2p_ie + p2pielen, devinfo_content, devinfo_contentlen); + memcpy(p2p_ie + p2pielen, devinfo_content, devinfo_contentlen); p2pielen += devinfo_contentlen; @@ -4391,7 +4391,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy, goto exit; } - _rtw_memcpy(&pcfg80211_wdinfo->remain_on_ch_channel, channel, sizeof(struct ieee80211_channel)); + memcpy(&pcfg80211_wdinfo->remain_on_ch_channel, channel, sizeof(struct ieee80211_channel)); #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)) pcfg80211_wdinfo->remain_on_ch_type= channel_type; #endif @@ -4535,7 +4535,7 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *b pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; - _rtw_memcpy(pframe, (void*)buf, len); + memcpy(pframe, (void*)buf, len); pattrib->pktlen = len; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -4776,7 +4776,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf, } - _rtw_memcpy(pmlmepriv->wps_beacon_ie, wps_ie, wps_ielen); + memcpy(pmlmepriv->wps_beacon_ie, wps_ie, wps_ielen); pmlmepriv->wps_beacon_ie_len = wps_ielen; update_beacon(padapter, _VENDOR_SPECIFIC_IE_, wps_oui, true); @@ -4808,7 +4808,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf, } - _rtw_memcpy(pmlmepriv->p2p_beacon_ie, p2p_ie, p2p_ielen); + memcpy(pmlmepriv->p2p_beacon_ie, p2p_ie, p2p_ielen); pmlmepriv->p2p_beacon_ie_len = p2p_ielen; } @@ -4920,7 +4920,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu *puconfig_method |= uconfig_method; } - _rtw_memcpy(pmlmepriv->wps_probe_resp_ie, wps_ie, wps_ielen); + memcpy(pmlmepriv->wps_probe_resp_ie, wps_ie, wps_ielen); pmlmepriv->wps_probe_resp_ie_len = wps_ielen; } @@ -4971,7 +4971,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu return -EINVAL; } - _rtw_memcpy(pmlmepriv->p2p_probe_resp_ie, p2p_ie, p2p_ielen); + memcpy(pmlmepriv->p2p_probe_resp_ie, p2p_ie, p2p_ielen); pmlmepriv->p2p_probe_resp_ie_len = p2p_ielen; } else @@ -4990,7 +4990,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu return -EINVAL; } - _rtw_memcpy(pmlmepriv->p2p_go_probe_resp_ie, p2p_ie, p2p_ielen); + memcpy(pmlmepriv->p2p_go_probe_resp_ie, p2p_ie, p2p_ielen); pmlmepriv->p2p_go_probe_resp_ie_len = p2p_ielen; } @@ -5055,7 +5055,7 @@ static int rtw_cfg80211_set_assoc_resp_wpsp2pie(struct net_device *net, char *bu return -EINVAL; } - _rtw_memcpy(pmlmepriv->wps_assoc_resp_ie, buf, len); + memcpy(pmlmepriv->wps_assoc_resp_ie, buf, len); pmlmepriv->wps_assoc_resp_ie_len = len; } diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index aeda48c..36f3edd 100755 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -140,7 +140,7 @@ static void indicate_wx_custom_event(struct adapter *padapter, char *msg) if(!buff) return; - _rtw_memcpy(buff, msg, strlen(msg)); + memcpy(buff, msg, strlen(msg)); _rtw_memset(&wrqu,0,sizeof(wrqu)); wrqu.data.length = strlen(msg); @@ -218,9 +218,9 @@ void rtw_indicate_wx_assoc_event(struct adapter *padapter) wrqu.ap_addr.sa_family = ARPHRD_ETHER; if(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)==true ) - _rtw_memcpy(wrqu.ap_addr.sa_data, pnetwork->MacAddress, ETH_ALEN); + memcpy(wrqu.ap_addr.sa_data, pnetwork->MacAddress, ETH_ALEN); else - _rtw_memcpy(wrqu.ap_addr.sa_data, pmlmepriv->cur_network.network.MacAddress, ETH_ALEN); + memcpy(wrqu.ap_addr.sa_data, pmlmepriv->cur_network.network.MacAddress, ETH_ALEN); DBG_871X_LEVEL(_drv_always_, "assoc success\n"); #ifndef CONFIG_IOCTL_CFG80211 @@ -391,7 +391,7 @@ static char *translate_scan(struct adapter *padapter, iwe.cmd = SIOCGIWAP; iwe.u.ap_addr.sa_family = ARPHRD_ETHER; - _rtw_memcpy(iwe.u.ap_addr.sa_data, pnetwork->network.MacAddress, ETH_ALEN); + memcpy(iwe.u.ap_addr.sa_data, pnetwork->network.MacAddress, ETH_ALEN); start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_ADDR_LEN); /* Add the ESSID */ @@ -407,7 +407,7 @@ static char *translate_scan(struct adapter *padapter, struct rtw_ieee80211_ht_cap *pht_capie; ht_cap = true; 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 = (le16_to_cpu(pht_capie->cap_info) & IEEE80211_HT_CAP_SUP_WIDTH) ? 1 : 0; short_GI = (le16_to_cpu(pht_capie->cap_info) & (IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40)) ? 1 : 0; } @@ -442,7 +442,7 @@ static char *translate_scan(struct adapter *padapter, /* Add mode */ iwe.cmd = SIOCGIWMODE; - _rtw_memcpy((u8 *)&le_cap, rtw_get_capability_from_ie(pnetwork->network.IEs), 2); + memcpy((u8 *)&le_cap, rtw_get_capability_from_ie(pnetwork->network.IEs), 2); cap = le16_to_cpu(le_cap); @@ -845,7 +845,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, pwep->KeyIndex = wep_key_idx; pwep->KeyIndex |= 0x80000000; - _rtw_memcpy(pwep->KeyMaterial, param->u.crypt.key, pwep->KeyLength); + memcpy(pwep->KeyMaterial, param->u.crypt.key, pwep->KeyLength); if(param->u.crypt.set_tx) { @@ -868,7 +868,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, goto exit; } - _rtw_memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength); + memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength); psecuritypriv->dot11DefKeylen[wep_key_idx]=pwep->KeyLength; rtw_set_key(padapter, psecuritypriv, wep_key_idx, 0,true); } @@ -901,13 +901,13 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, if(param->u.crypt.set_tx ==1)//pairwise key { - _rtw_memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); if(strcmp(param->u.crypt.alg, "TKIP") == 0)//set mic key { //DEBUG_ERR(("\nset key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); - _rtw_memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); - _rtw_memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); + memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); + memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); padapter->securitypriv.busetkipkey=false; //_set_timer(&padapter->securitypriv.tkip_timer, 50); @@ -923,12 +923,12 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, if(strcmp(param->u.crypt.alg, "TKIP") == 0 || strcmp(param->u.crypt.alg, "CCMP") == 0) { printk("[%s] GTK key_len=%d @@@@@@@@@@@@@@@@@@\n", param->u.crypt.alg, param->u.crypt.key_len); - _rtw_memcpy(padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); //only TKIP group key need to install this if(param->u.crypt.key_len > 16) { - _rtw_memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[16]),8); - _rtw_memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[24]),8); + memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[16]),8); + memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[24]),8); } padapter->securitypriv.binstallGrpkey = true; //DEBUG_ERR((" param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); @@ -944,7 +944,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, int no; //printk("BIP key_len=%d , index=%d @@@@@@@@@@@@@@@@@@\n", param->u.crypt.key_len, param->u.crypt.idx); //save the IGTK key, length 16 bytes - _rtw_memcpy(padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); /*printk("IGTK key below:\n"); for(no=0;no<16;no++) printk(" %02x ", padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey[no]); @@ -1002,19 +1002,19 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, list_for_each_entry(pWapiSta, &pWapiInfo->wapiSTAUsedList, list) { if(_rtw_memcmp(pWapiSta->PeerMacAddr,param->sta_addr,6)) { - _rtw_memcpy(pWapiSta->lastTxUnicastPN,WapiASUEPNInitialValueSrc,16); + memcpy(pWapiSta->lastTxUnicastPN,WapiASUEPNInitialValueSrc,16); pWapiSta->wapiUsk.bSet = true; - _rtw_memcpy(pWapiSta->wapiUsk.dataKey,param->u.crypt.key,16); - _rtw_memcpy(pWapiSta->wapiUsk.micKey,param->u.crypt.key+16,16); + memcpy(pWapiSta->wapiUsk.dataKey,param->u.crypt.key,16); + memcpy(pWapiSta->wapiUsk.micKey,param->u.crypt.key+16,16); pWapiSta->wapiUsk.keyId = param->u.crypt.idx ; pWapiSta->wapiUsk.bTxEnable = true; - _rtw_memcpy(pWapiSta->lastRxUnicastPNBEQueue,WapiAEPNInitialValueSrc,16); - _rtw_memcpy(pWapiSta->lastRxUnicastPNBKQueue,WapiAEPNInitialValueSrc,16); - _rtw_memcpy(pWapiSta->lastRxUnicastPNVIQueue,WapiAEPNInitialValueSrc,16); - _rtw_memcpy(pWapiSta->lastRxUnicastPNVOQueue,WapiAEPNInitialValueSrc,16); - _rtw_memcpy(pWapiSta->lastRxUnicastPN,WapiAEPNInitialValueSrc,16); + memcpy(pWapiSta->lastRxUnicastPNBEQueue,WapiAEPNInitialValueSrc,16); + memcpy(pWapiSta->lastRxUnicastPNBKQueue,WapiAEPNInitialValueSrc,16); + memcpy(pWapiSta->lastRxUnicastPNVIQueue,WapiAEPNInitialValueSrc,16); + memcpy(pWapiSta->lastRxUnicastPNVOQueue,WapiAEPNInitialValueSrc,16); + memcpy(pWapiSta->lastRxUnicastPN,WapiAEPNInitialValueSrc,16); pWapiSta->wapiUskUpdate.bTxEnable = false; pWapiSta->wapiUskUpdate.bSet = false; @@ -1032,15 +1032,15 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, if(_rtw_memcmp(pWapiSta->PeerMacAddr,get_bssid(pmlmepriv),6)) { pWapiSta->wapiMsk.bSet = true; - _rtw_memcpy(pWapiSta->wapiMsk.dataKey,param->u.crypt.key,16); - _rtw_memcpy(pWapiSta->wapiMsk.micKey,param->u.crypt.key+16,16); + memcpy(pWapiSta->wapiMsk.dataKey,param->u.crypt.key,16); + memcpy(pWapiSta->wapiMsk.micKey,param->u.crypt.key+16,16); pWapiSta->wapiMsk.keyId = param->u.crypt.idx ; pWapiSta->wapiMsk.bTxEnable = false; if(!pWapiSta->bSetkeyOk) pWapiSta->bSetkeyOk = true; pWapiSta->bAuthenticateInProgress = false; - _rtw_memcpy(pWapiSta->lastRxMulticastPN, WapiAEMultiCastPNInitialValueSrc, 16); + memcpy(pWapiSta->lastRxMulticastPN, WapiAEMultiCastPNInitialValueSrc, 16); if (psecuritypriv->sw_decrypt == false) { @@ -1092,7 +1092,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie goto exit; } - _rtw_memcpy(buf, pie , ielen); + memcpy(buf, pie , ielen); //dump { @@ -1113,14 +1113,14 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie { padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_8021X; padapter->securitypriv.ndisauthtype=Ndis802_11AuthModeWPAPSK; - _rtw_memcpy(padapter->securitypriv.supplicant_ie, &buf[0], ielen); + memcpy(padapter->securitypriv.supplicant_ie, &buf[0], ielen); } if(rtw_parse_wpa2_ie(buf, ielen, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) { padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_8021X; padapter->securitypriv.ndisauthtype=Ndis802_11AuthModeWPA2PSK; - _rtw_memcpy(padapter->securitypriv.supplicant_ie, &buf[0], ielen); + memcpy(padapter->securitypriv.supplicant_ie, &buf[0], ielen); } if (group_cipher == 0) @@ -1195,7 +1195,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie padapter->securitypriv.wps_ie_len = ( (buf[cnt+1]+2) < (MAX_WPA_IE_LEN<<2)) ? (buf[cnt+1]+2):(MAX_WPA_IE_LEN<<2); - _rtw_memcpy(padapter->securitypriv.wps_ie, &buf[cnt], padapter->securitypriv.wps_ie_len); + memcpy(padapter->securitypriv.wps_ie, &buf[cnt], padapter->securitypriv.wps_ie_len); set_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS); @@ -1479,7 +1479,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev, If cmd is IW_PMKSA_REMOVE, it means the wpa_supplicant wants to remove a PMKID/BSSID from driver. */ - _rtw_memcpy( strIssueBssid, pPMK->bssid.sa_data, ETH_ALEN); + memcpy( strIssueBssid, pPMK->bssid.sa_data, ETH_ALEN); if ( pPMK->cmd == IW_PMKSA_ADD ) { DBG_871X( "[rtw_wx_set_pmkid] IW_PMKSA_ADD!\n" ); @@ -1501,7 +1501,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev, DBG_871X( "[rtw_wx_set_pmkid] BSSID exists in the PMKList.\n" ); - _rtw_memcpy( psecuritypriv->PMKIDList[j].PMKID, pPMK->pmkid, IW_PMKID_LEN); + memcpy( psecuritypriv->PMKIDList[j].PMKID, pPMK->pmkid, IW_PMKID_LEN); psecuritypriv->PMKIDList[ j ].bUsed = true; psecuritypriv->PMKIDIndex = j+1; blInserted = true; @@ -1515,8 +1515,8 @@ static int rtw_wx_set_pmkid(struct net_device *dev, DBG_871X( "[rtw_wx_set_pmkid] Use the new entry index = %d for this PMKID.\n", psecuritypriv->PMKIDIndex ); - _rtw_memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, strIssueBssid, ETH_ALEN); - _rtw_memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].PMKID, pPMK->pmkid, IW_PMKID_LEN); + memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, strIssueBssid, ETH_ALEN); + memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].PMKID, pPMK->pmkid, IW_PMKID_LEN); psecuritypriv->PMKIDList[ psecuritypriv->PMKIDIndex ].bUsed = true; psecuritypriv->PMKIDIndex++ ; @@ -1811,7 +1811,7 @@ static int rtw_wx_get_wap(struct net_device *dev, ((check_fwstate(pmlmepriv, WIFI_AP_STATE)) == true) ) { - _rtw_memcpy(wrqu->ap_addr.sa_data, pcur_bss->MacAddress, ETH_ALEN); + memcpy(wrqu->ap_addr.sa_data, pcur_bss->MacAddress, ETH_ALEN); } else { @@ -1969,7 +1969,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, { int len = min((int)req->essid_len, IW_ESSID_MAX_SIZE); - _rtw_memcpy(ssid[0].Ssid, req->essid, len); + memcpy(ssid[0].Ssid, req->essid, len); ssid[0].SsidLength = len; DBG_871X("IW_SCAN_THIS_ESSID, ssid=%s, len=%d\n", req->essid, req->essid_len); @@ -2017,7 +2017,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, if(sec_len>0 && sec_len<=len) { ssid[ssid_index].SsidLength = sec_len; - _rtw_memcpy(ssid[ssid_index].Ssid, pos, ssid[ssid_index].SsidLength); + memcpy(ssid[ssid_index].Ssid, pos, ssid[ssid_index].SsidLength); //DBG_871X("%s COMBO_SCAN with specific ssid:%s, %d\n", __FUNCTION__ // , ssid[ssid_index].Ssid, ssid[ssid_index].SsidLength); ssid_index++; @@ -2265,7 +2265,7 @@ static int rtw_wx_set_essid(struct net_device *dev, _rtw_memset(&ndis_ssid, 0, sizeof(NDIS_802_11_SSID)); ndis_ssid.SsidLength = len; - _rtw_memcpy(ndis_ssid.Ssid, extra, len); + memcpy(ndis_ssid.Ssid, extra, len); src_ssid = ndis_ssid.Ssid; RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, ("rtw_wx_set_essid: ssid=[%s]\n", src_ssid)); @@ -2357,7 +2357,7 @@ static int rtw_wx_get_essid(struct net_device *dev, wrqu->essid.length = len; - _rtw_memcpy(extra, pcur_bss->Ssid.Ssid, len); + memcpy(extra, pcur_bss->Ssid.Ssid, len); wrqu->essid.flags = 1; } @@ -2718,7 +2718,7 @@ static int rtw_wx_set_enc(struct net_device *dev, wep.KeyIndex |= 0x80000000; - _rtw_memcpy(wep.KeyMaterial, keybuf, wep.KeyLength); + memcpy(wep.KeyMaterial, keybuf, wep.KeyLength); if (rtw_set_802_11_add_wep(padapter, &wep) == false) { if(rf_on == pwrpriv->rf_pwrstate ) @@ -2790,7 +2790,7 @@ static int rtw_wx_get_enc(struct net_device *dev, if(erq->length) { - _rtw_memcpy(keybuf, padapter->securitypriv.dot11DefKey[key].skey, padapter->securitypriv.dot11DefKeylen[key]); + memcpy(keybuf, padapter->securitypriv.dot11DefKey[key].skey, padapter->securitypriv.dot11DefKeylen[key]); erq->flags |= IW_ENCODE_ENABLED; @@ -3057,7 +3057,7 @@ static int rtw_wx_set_enc_ext(struct net_device *dev, #ifndef CONFIG_IOCTL_CFG80211 case IW_ENCODE_ALG_SM4: alg_name= "SMS4"; - _rtw_memcpy(param->sta_addr, pext->addr.sa_data, ETH_ALEN); + memcpy(param->sta_addr, pext->addr.sa_data, ETH_ALEN); DBG_871X("rtw_wx_set_enc_ext: SMS4 case \n"); break; #endif @@ -3093,18 +3093,18 @@ static int rtw_wx_set_enc_ext(struct net_device *dev, #ifdef CONFIG_WAPI_SUPPORT #ifndef CONFIG_IOCTL_CFG80211 if(pext->alg == IW_ENCODE_ALG_SM4) - _rtw_memcpy(param->u.crypt.seq, pext->rx_seq, 16); + memcpy(param->u.crypt.seq, pext->rx_seq, 16); else #endif //CONFIG_IOCTL_CFG80211 #endif //CONFIG_WAPI_SUPPORT - _rtw_memcpy(param->u.crypt.seq, pext->rx_seq, 8); + memcpy(param->u.crypt.seq, pext->rx_seq, 8); } if(pext->key_len) { param->u.crypt.key_len = pext->key_len; - //_rtw_memcpy(param + 1, pext + 1, pext->key_len); - _rtw_memcpy(param->u.crypt.key, pext + 1, pext->key_len); + //memcpy(param + 1, pext + 1, pext->key_len); + memcpy(param->u.crypt.key, pext + 1, pext->key_len); } if (pencoding->flags & IW_ENCODE_DISABLED) @@ -3131,7 +3131,7 @@ static int rtw_wx_get_nick(struct net_device *dev, if(extra) { wrqu->data.length = 14; wrqu->data.flags = 1; - _rtw_memcpy(extra, "", 14); + memcpy(extra, "", 14); } return 0; } @@ -3435,7 +3435,7 @@ static int rtw_drvext_hdl(struct net_device *dev, struct iw_request_info *info, ret = 0; if (bset == 0x00) {//query info - //_rtw_memcpy(p->pointer, pparmbuf, len); + //memcpy(p->pointer, pparmbuf, len); if (copy_to_user(p->pointer, pparmbuf, len)) ret = -EFAULT; } @@ -3888,7 +3888,7 @@ static int rtw_p2p_set_go_nego_ssid(struct net_device *dev, struct wifidirect_info *pwdinfo= &(padapter->wdinfo); DBG_871X( "[%s] ssid = %s, len = %zu\n", __FUNCTION__, extra, strlen( extra ) ); - _rtw_memcpy( pwdinfo->nego_ssid, extra, strlen( extra ) ); + memcpy( pwdinfo->nego_ssid, extra, strlen( extra ) ); pwdinfo->nego_ssidlen = strlen( extra ); return ret; @@ -4033,7 +4033,7 @@ static int rtw_p2p_profilefound(struct net_device *dev, } //pwdinfo->profileinfo[ pwdinfo->profileindex ].ssidlen = ( extra[18] - '0' ) * 10 + ( extra[ 19 ] - '0' ); - //_rtw_memcpy( pwdinfo->profileinfo[ pwdinfo->profileindex ].ssid, &extra[ 20 ], pwdinfo->profileinfo[ pwdinfo->profileindex ].ssidlen ); + //memcpy( pwdinfo->profileinfo[ pwdinfo->profileindex ].ssid, &extra[ 20 ], pwdinfo->profileinfo[ pwdinfo->profileindex ].ssidlen ); pwdinfo->profileindex++; } } @@ -4055,7 +4055,7 @@ static int rtw_p2p_setDN(struct net_device *dev, DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); _rtw_memset( pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN ); - _rtw_memcpy( pwdinfo->device_name, extra, wrqu->data.length - 1 ); + memcpy( pwdinfo->device_name, extra, wrqu->data.length - 1 ); pwdinfo->device_name_len = wrqu->data.length - 1; return ret; @@ -4325,7 +4325,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev, } wrqu->data.length = strlen(attr_content_str); - _rtw_memcpy(extra, attr_content_str, wrqu->data.length); + memcpy(extra, attr_content_str, wrqu->data.length); return ret; @@ -4478,7 +4478,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev, } wrqu->data.length = strlen(go_devadd_str); - _rtw_memcpy(extra, go_devadd_str, wrqu->data.length); + memcpy(extra, go_devadd_str, wrqu->data.length); return ret; @@ -4535,7 +4535,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev, __be16 be_type; u16 type; - _rtw_memcpy(&be_type, dev_type, 2); + memcpy(&be_type, dev_type, 2); type = be16_to_cpu(be_type); sprintf(dev_type_str, "\n\nN=%.2d", type); blnMatch = 1; @@ -4556,7 +4556,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev, } wrqu->data.length = strlen(dev_type_str); - _rtw_memcpy(extra, dev_type_str, wrqu->data.length); + memcpy(extra, dev_type_str, wrqu->data.length); return ret; @@ -4630,7 +4630,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev, } wrqu->data.length = strlen(dev_name_str); - _rtw_memcpy(extra, dev_name_str, wrqu->data.length); + memcpy(extra, dev_name_str, wrqu->data.length); return ret; @@ -4719,7 +4719,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev, } wrqu->data.length = strlen(inv_proc_str); - _rtw_memcpy(extra, inv_proc_str, wrqu->data.length); + memcpy(extra, inv_proc_str, wrqu->data.length); return ret; @@ -4796,7 +4796,7 @@ static int rtw_p2p_connect(struct net_device *dev, _rtw_memset( &pwdinfo->groupid_info, 0x00, sizeof( struct group_id_info ) ); pwdinfo->nego_req_info.peer_channel_num[ 0 ] = uintPeerChannel; - _rtw_memcpy( pwdinfo->nego_req_info.peerDevAddr, pnetwork->network.MacAddress, ETH_ALEN ); + memcpy( pwdinfo->nego_req_info.peerDevAddr, pnetwork->network.MacAddress, ETH_ALEN ); pwdinfo->nego_req_info.benable = true; _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); @@ -4979,7 +4979,7 @@ static int rtw_p2p_invite_req(struct net_device *dev, // Store the GO's ssid pinvite_req_info->ssidlen = wrqu->data.length - 36; - _rtw_memcpy( pinvite_req_info->go_ssid, &extra[ 36 ], (u32) pinvite_req_info->ssidlen ); + memcpy( pinvite_req_info->go_ssid, &extra[ 36 ], (u32) pinvite_req_info->ssidlen ); pinvite_req_info->benable = true; pinvite_req_info->peer_ch = uintPeerChannel; @@ -5636,8 +5636,8 @@ static int rtw_p2p_prov_disc(struct net_device *dev, #endif // CONFIG_WFD DBG_871X( "[%s] peer channel: %d!\n", __FUNCTION__, uintPeerChannel ); - _rtw_memcpy( pwdinfo->tx_prov_disc_info.peerIFAddr, pnetwork->network.MacAddress, ETH_ALEN ); - _rtw_memcpy( pwdinfo->tx_prov_disc_info.peerDevAddr, peerMAC, ETH_ALEN ); + memcpy( pwdinfo->tx_prov_disc_info.peerIFAddr, pnetwork->network.MacAddress, ETH_ALEN ); + memcpy( pwdinfo->tx_prov_disc_info.peerDevAddr, peerMAC, ETH_ALEN ); pwdinfo->tx_prov_disc_info.peer_channel_num[0] = ( u16 ) uintPeerChannel; pwdinfo->tx_prov_disc_info.benable = true; rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo)); @@ -5645,11 +5645,11 @@ static int rtw_p2p_prov_disc(struct net_device *dev, if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_CLIENT)) { - _rtw_memcpy( &pwdinfo->tx_prov_disc_info.ssid, &pnetwork->network.Ssid, sizeof( NDIS_802_11_SSID ) ); + memcpy( &pwdinfo->tx_prov_disc_info.ssid, &pnetwork->network.Ssid, sizeof( NDIS_802_11_SSID ) ); } else if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE) || rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO)) { - _rtw_memcpy( pwdinfo->tx_prov_disc_info.ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN ); + memcpy( pwdinfo->tx_prov_disc_info.ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN ); pwdinfo->tx_prov_disc_info.ssid.SsidLength= P2P_WILDCARD_SSID_LEN; } @@ -7011,9 +7011,9 @@ static u8 set_pairwise_key(struct adapter *padapter, struct sta_info *psta) psetstakey_para->algorithm = (u8)psta->dot118021XPrivacy; - _rtw_memcpy(psetstakey_para->addr, psta->hwaddr, ETH_ALEN); + memcpy(psetstakey_para->addr, psta->hwaddr, ETH_ALEN); - _rtw_memcpy(psetstakey_para->key, &psta->dot118021x_UncstKey, 16); + memcpy(psetstakey_para->key, &psta->dot118021x_UncstKey, 16); res = rtw_enqueue_cmd(pcmdpriv, ph2c); @@ -7071,7 +7071,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid) keylen = 16; } - _rtw_memcpy(&(psetkeyparm->key[0]), key, keylen); + memcpy(&(psetkeyparm->key[0]), key, keylen); pcmd->cmdcode = _SetKey_CMD_; pcmd->parmbuf = (u8 *)psetkeyparm; @@ -7202,7 +7202,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, pwep->KeyIndex = wep_key_idx; - _rtw_memcpy(pwep->KeyMaterial, param->u.crypt.key, pwep->KeyLength); + memcpy(pwep->KeyMaterial, param->u.crypt.key, pwep->KeyLength); if(param->u.crypt.set_tx) { @@ -7221,7 +7221,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx; - _rtw_memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength); + memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength); psecuritypriv->dot11DefKeylen[wep_key_idx]=pwep->KeyLength; @@ -7236,7 +7236,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, //don't update "psecuritypriv->dot11PrivacyAlgrthm" and //"psecuritypriv->dot11PrivacyKeyIndex=keyid", but can rtw_set_key to cam - _rtw_memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength); + memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength); psecuritypriv->dot11DefKeylen[wep_key_idx] = pwep->KeyLength; @@ -7257,7 +7257,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, { DBG_871X("%s, set group_key, WEP\n", __FUNCTION__); - _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); psecuritypriv->dot118021XGrpPrivacy = _WEP40_; if(param->u.crypt.key_len==13) @@ -7272,12 +7272,12 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, psecuritypriv->dot118021XGrpPrivacy = _TKIP_; - _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); //DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); //set mic key - _rtw_memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); - _rtw_memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); + memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); + memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); psecuritypriv->busetkipkey = true; @@ -7288,7 +7288,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, psecuritypriv->dot118021XGrpPrivacy = _AES_; - _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); } else { @@ -7324,7 +7324,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, { if(param->u.crypt.set_tx ==1) { - _rtw_memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); if(strcmp(param->u.crypt.alg, "WEP") == 0) { @@ -7344,8 +7344,8 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, //DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); //set mic key - _rtw_memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); - _rtw_memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); + memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8); + memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8); psecuritypriv->busetkipkey = true; @@ -7373,7 +7373,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, { if(strcmp(param->u.crypt.alg, "WEP") == 0) { - _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); psecuritypriv->dot118021XGrpPrivacy = _WEP40_; if(param->u.crypt.key_len==13) @@ -7385,12 +7385,12 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, { psecuritypriv->dot118021XGrpPrivacy = _TKIP_; - _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); //DEBUG_ERR("set key length :param->u.crypt.key_len=%d\n", param->u.crypt.key_len); //set mic key - _rtw_memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); - _rtw_memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); + memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8); + memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8); psecuritypriv->busetkipkey = true; @@ -7399,7 +7399,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, { psecuritypriv->dot118021XGrpPrivacy = _AES_; - _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); + memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); } else { @@ -7452,7 +7452,7 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != true) return -EINVAL; - _rtw_memcpy(&pstapriv->max_num_sta, param->u.bcn_ie.reserved, 2); + memcpy(&pstapriv->max_num_sta, param->u.bcn_ie.reserved, 2); if((pstapriv->max_num_sta>NUM_STA) || (pstapriv->max_num_sta<=0)) pstapriv->max_num_sta = NUM_STA; @@ -7532,7 +7532,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) psta->aid = param->u.add_sta.aid;//aid=1~2007 - _rtw_memcpy(psta->bssrateset, param->u.add_sta.tx_supp_rates, 16); + memcpy(psta->bssrateset, param->u.add_sta.tx_supp_rates, 16); //check wmm cap. @@ -7551,7 +7551,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) { psta->htpriv.ht_option = true; psta->qos_option = 1; - _rtw_memcpy((void*)&psta->htpriv.ht_cap, (void*)¶m->u.add_sta.ht_cap, sizeof(struct rtw_ieee80211_ht_cap)); + memcpy((void*)&psta->htpriv.ht_cap, (void*)¶m->u.add_sta.ht_cap, sizeof(struct rtw_ieee80211_ht_cap)); } else { @@ -7671,9 +7671,9 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par (psta->ht_20mhz_set <<5)); psta_data->tx_supp_rates_len = psta->bssratelen; - _rtw_memcpy(psta_data->tx_supp_rates, psta->bssrateset, psta->bssratelen); + memcpy(psta_data->tx_supp_rates, psta->bssrateset, psta->bssratelen); #ifdef CONFIG_80211N_HT - _rtw_memcpy(&psta_data->ht_cap, &psta->htpriv.ht_cap, sizeof(struct rtw_ieee80211_ht_cap)); + memcpy(&psta_data->ht_cap, &psta->htpriv.ht_cap, sizeof(struct rtw_ieee80211_ht_cap)); #endif //CONFIG_80211N_HT psta_data->rx_pkts = psta->sta_stats.rx_data_pkts; psta_data->rx_bytes = psta->sta_stats.rx_bytes; @@ -7730,7 +7730,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param) param->u.wpa_ie.len = copy_len; - _rtw_memcpy(param->u.wpa_ie.reserved, psta->wpa_ie, copy_len); + memcpy(param->u.wpa_ie.reserved, psta->wpa_ie, copy_len); } else { @@ -7780,7 +7780,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, return -EINVAL; } - _rtw_memcpy(pmlmepriv->wps_beacon_ie, param->u.bcn_ie.buf, ie_len); + memcpy(pmlmepriv->wps_beacon_ie, param->u.bcn_ie.buf, ie_len); update_beacon(padapter, _VENDOR_SPECIFIC_IE_, wps_oui, true); @@ -7822,7 +7822,7 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); return -EINVAL; } - _rtw_memcpy(pmlmepriv->wps_probe_resp_ie, param->u.bcn_ie.buf, ie_len); + memcpy(pmlmepriv->wps_probe_resp_ie, param->u.bcn_ie.buf, ie_len); } @@ -7860,7 +7860,7 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par return -EINVAL; } - _rtw_memcpy(pmlmepriv->wps_assoc_resp_ie, param->u.bcn_ie.buf, ie_len); + memcpy(pmlmepriv->wps_assoc_resp_ie, param->u.bcn_ie.buf, ie_len); } @@ -7896,7 +7896,7 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, WLAN_BSSID_EX *pbss_network = &mlmepriv->cur_network.network; WLAN_BSSID_EX *pbss_network_ext = &mlmeinfo->network; - _rtw_memcpy(ssid, ssid_ie+2, ssid_len); + memcpy(ssid, ssid_ie+2, ssid_len); ssid[ssid_len>NDIS_802_11_LENGTH_SSID?NDIS_802_11_LENGTH_SSID:ssid_len] = 0x0; if(0) @@ -7905,9 +7905,9 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, pbss_network->Ssid.Ssid, pbss_network->Ssid.SsidLength, pbss_network_ext->Ssid.Ssid, pbss_network_ext->Ssid.SsidLength); - _rtw_memcpy(pbss_network->Ssid.Ssid, (void *)ssid, ssid_len); + memcpy(pbss_network->Ssid.Ssid, (void *)ssid, ssid_len); pbss_network->Ssid.SsidLength = ssid_len; - _rtw_memcpy(pbss_network_ext->Ssid.Ssid, (void *)ssid, ssid_len); + memcpy(pbss_network_ext->Ssid.Ssid, (void *)ssid, ssid_len); pbss_network_ext->Ssid.SsidLength = ssid_len; if(0) @@ -8171,7 +8171,7 @@ static int rtw_wx_set_priv(struct net_device *dev, return -ENOMEM; } - _rtw_memcpy(ext_dbg, ext, len); + memcpy(ext_dbg, ext, len); #endif //added for wps2.0 @20110524 @@ -8188,7 +8188,7 @@ static int rtw_wx_set_priv(struct net_device *dev, { cp_sz = probereq_wpsie_len>MAX_WPS_IE_LEN ? MAX_WPS_IE_LEN:probereq_wpsie_len; - //_rtw_memcpy(pmlmepriv->probereq_wpsie, probereq_wpsie, cp_sz); + //memcpy(pmlmepriv->probereq_wpsie, probereq_wpsie, cp_sz); //pmlmepriv->probereq_wpsie_len = cp_sz; if(pmlmepriv->wps_probe_req_ie) { @@ -8206,7 +8206,7 @@ static int rtw_wx_set_priv(struct net_device *dev, } - _rtw_memcpy(pmlmepriv->wps_probe_req_ie, probereq_wpsie, cp_sz); + memcpy(pmlmepriv->wps_probe_req_ie, probereq_wpsie, cp_sz); pmlmepriv->wps_probe_req_ie_len = cp_sz; } @@ -9344,7 +9344,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, } else if (strcmp(tmp[0], "btfk2map") == 0) { - _rtw_memcpy(pEfuseHal->BTEfuseModifiedMap, pEfuseHal->fakeBTEfuseModifiedMap, EFUSE_BT_MAX_MAP_LEN); + memcpy(pEfuseHal->BTEfuseModifiedMap, pEfuseHal->fakeBTEfuseModifiedMap, EFUSE_BT_MAX_MAP_LEN); EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); if (max_available_size < 1) @@ -9528,7 +9528,7 @@ static int rtw_tdls_enable(struct net_device *dev, if(psta->tdls_sta_state != TDLS_STATE_NONE) { - _rtw_memcpy(tdls_sta[index], psta->hwaddr, ETH_ALEN); + memcpy(tdls_sta[index], psta->hwaddr, ETH_ALEN); } } } @@ -10101,7 +10101,7 @@ static int rtw_widi_set_probe_request(struct net_device *dev, if(pbuf) { copy_from_user(pbuf, wrqu->data.pointer, wrqu->data.length); - //_rtw_memcpy(pbuf, wrqu->data.pointer, wrqu->data.length); + //memcpy(pbuf, wrqu->data.pointer, wrqu->data.length); if( wrqu->data.flags == 0 ) intel_widi_wk_cmd(padapter, INTEL_WIDI_ISSUE_PROB_WK, pbuf); @@ -10187,11 +10187,11 @@ static s32 createpseudoadhoc(struct adapter *padapter) passoc_ssid = &pmlmepriv->assoc_ssid; _rtw_memset(passoc_ssid, 0, sizeof(NDIS_802_11_SSID)); passoc_ssid->SsidLength = sizeof(ssid) - 1; - _rtw_memcpy(passoc_ssid->Ssid, ssid, passoc_ssid->SsidLength); + memcpy(passoc_ssid->Ssid, ssid, passoc_ssid->SsidLength); pdev_network = &padapter->registrypriv.dev_network; pibss = padapter->registrypriv.dev_network.MacAddress; - _rtw_memcpy(&pdev_network->Ssid, passoc_ssid, sizeof(NDIS_802_11_SSID)); + memcpy(&pdev_network->Ssid, passoc_ssid, sizeof(NDIS_802_11_SSID)); rtw_update_registrypriv_dev_network(padapter); rtw_generate_random_ibss(pibss); @@ -10217,7 +10217,7 @@ static s32 createpseudoadhoc(struct adapter *padapter) //3 join psudo AdHoc pcur_network->join_res = 1; pcur_network->aid = psta->aid = 1; - _rtw_memcpy(&pcur_network->network, pdev_network, get_WLAN_BSSID_EX_sz(pdev_network)); + memcpy(&pcur_network->network, pdev_network, get_WLAN_BSSID_EX_sz(pdev_network)); { u8 val8; @@ -10274,10 +10274,10 @@ static struct xmit_frame* createloopbackpkt(struct adapter *padapter, u32 size) _rtw_memset(pattrib, 0, sizeof(struct pkt_attrib)); pattrib->ether_type = 0x8723; - _rtw_memcpy(pattrib->src, padapter->eeprompriv.mac_addr, ETH_ALEN); - _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); + memcpy(pattrib->src, padapter->eeprompriv.mac_addr, ETH_ALEN); + memcpy(pattrib->ta, pattrib->src, ETH_ALEN); _rtw_memset(pattrib->dst, 0xFF, ETH_ALEN); - _rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); + memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); // pattrib->pctrl = 0; // pattrib->dhcp_pkt = 0; // pattrib->pktlen = 0; @@ -10336,9 +10336,9 @@ static struct xmit_frame* createloopbackpkt(struct adapter *padapter, u32 size) //3 5.1. make wlan header, make_wlanhdr() hdr = (struct rtw_ieee80211_hdr *)pkt_start; SetFrameSubType(&hdr->frame_ctl, pattrib->subtype); - _rtw_memcpy(hdr->addr1, pattrib->dst, ETH_ALEN); // DA - _rtw_memcpy(hdr->addr2, pattrib->src, ETH_ALEN); // SA - _rtw_memcpy(hdr->addr3, get_bssid(&padapter->mlmepriv), ETH_ALEN); // RA, BSSID + memcpy(hdr->addr1, pattrib->dst, ETH_ALEN); // DA + memcpy(hdr->addr2, pattrib->src, ETH_ALEN); // SA + memcpy(hdr->addr3, get_bssid(&padapter->mlmepriv), ETH_ALEN); // RA, BSSID //3 5.2. make payload ptr = pkt_start + pattrib->hdrlen; @@ -10384,7 +10384,7 @@ static void printdata(u8 *pbuf, u32 len) u8 n; val = 0; n = len - i; - _rtw_memcpy(&val, pbuf+i, n); + memcpy(&val, pbuf+i, n); sprintf(str, "%08X", val); n = (4 - n) * 2; printk("%8s", str+n); @@ -10496,7 +10496,7 @@ thread_return lbk_thread(thread_context context) } ploopback->txsize = TXDESC_SIZE + pxmitframe->attrib.last_txcmdsz; - _rtw_memcpy(ploopback->txbuf, pxmitframe->buf_addr, ploopback->txsize); + memcpy(ploopback->txbuf, pxmitframe->buf_addr, ploopback->txsize); ff_hwaddr = rtw_get_ff_hwaddr(pxmitframe); cnt++; DBG_8192C("%s: wirte port cnt=%d size=%d\n", __func__, cnt, ploopback->txsize); @@ -10564,7 +10564,7 @@ static void loopbackTest(struct adapter *padapter, u32 cnt, u32 size, u8* pmsg) if (len) break; rtw_msleep_os(1); } while (1); - _rtw_memcpy(pmsg, ploopback->msg, len+1); + memcpy(pmsg, ploopback->msg, len+1); freeLoopback(padapter); return; @@ -11041,7 +11041,7 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_ union iwreq_data wdata; - _rtw_memcpy(&wdata, wrq_data, sizeof(wdata)); + memcpy(&wdata, wrq_data, sizeof(wdata)); input_len = wdata.data.length; input = rtw_zmalloc(input_len); @@ -11168,7 +11168,7 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_ wdata.data.length = priv_args[k].set_args & IW_PRIV_SIZE_MASK; /* Fetch string */ - _rtw_memcpy(buffer, ptr, wdata.data.length); + memcpy(buffer, ptr, wdata.data.length); } else { @@ -11206,7 +11206,7 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_ /* First case : all SET args fit within wrq */ if (offset) wdata.mode = subcmd; - _rtw_memcpy(wdata.name + offset, buffer, IFNAMSIZ - offset); + memcpy(wdata.name + offset, buffer, IFNAMSIZ - offset); } else { @@ -11296,7 +11296,7 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_ err = -E2BIG; goto exit; } - _rtw_memcpy(output+output_len, str, len); + memcpy(output+output_len, str, len); } break; @@ -11311,13 +11311,13 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_ err = -E2BIG; goto exit; } - _rtw_memcpy(output+output_len, str, len); + memcpy(output+output_len, str, len); } break; case IW_PRIV_TYPE_CHAR: /* Display args */ - _rtw_memcpy(output, extra, n); + memcpy(output, extra, n); break; default: diff --git a/os_dep/mlme_linux.c b/os_dep/mlme_linux.c index af207d1..c9f3c71 100755 --- a/os_dep/mlme_linux.c +++ b/os_dep/mlme_linux.c @@ -210,7 +210,7 @@ void rtw_reset_securitypriv( struct adapter *adapter ) _rtw_memset( &backupPMKIDList[ 0 ], 0x00, sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); - _rtw_memcpy( &backupPMKIDList[ 0 ], &adapter->securitypriv.PMKIDList[ 0 ], sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); + memcpy( &backupPMKIDList[ 0 ], &adapter->securitypriv.PMKIDList[ 0 ], sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); backupPMKIDIndex = adapter->securitypriv.PMKIDIndex; backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure; backupTKIPcountermeasure_time = adapter->securitypriv.btkip_countermeasure_time; @@ -223,7 +223,7 @@ void rtw_reset_securitypriv( struct adapter *adapter ) // Added by Albert 2009/02/18 // Restore the PMK information to securitypriv structure for the following connection. - _rtw_memcpy( &adapter->securitypriv.PMKIDList[ 0 ], &backupPMKIDList[ 0 ], sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); + memcpy( &adapter->securitypriv.PMKIDList[ 0 ], &backupPMKIDList[ 0 ], sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); adapter->securitypriv.PMKIDIndex = backupPMKIDIndex; adapter->securitypriv.btkip_countermeasure = backupTKIPCountermeasure; adapter->securitypriv.btkip_countermeasure_time = backupTKIPcountermeasure_time; @@ -409,7 +409,7 @@ void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_info *pst wrqu.addr.sa_family = ARPHRD_ETHER; - _rtw_memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); + memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); DBG_871X("+rtw_indicate_sta_assoc_event\n"); @@ -436,7 +436,7 @@ void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info * wrqu.addr.sa_family = ARPHRD_ETHER; - _rtw_memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); + memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); DBG_871X("+rtw_indicate_sta_disassoc_event\n"); @@ -579,7 +579,7 @@ int hostapd_mode_init(struct adapter *padapter) mac[4]=0x11; mac[5]=0x12; - _rtw_memcpy(pnetdev->dev_addr, mac, ETH_ALEN); + memcpy(pnetdev->dev_addr, mac, ETH_ALEN); netif_carrier_off(pnetdev); diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 9c6156b..5573bd6 100755 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -322,7 +322,7 @@ static uint loadparam( struct adapter *padapter, _nic_hdl pnetdev) //registry_par->hci = (u8)hci; registry_par->network_mode = (u8)rtw_network_mode; - _rtw_memcpy(registry_par->ssid.Ssid, "ANY", 3); + memcpy(registry_par->ssid.Ssid, "ANY", 3); registry_par->ssid.SsidLength = 3; registry_par->channel = (u8)rtw_channel; @@ -447,8 +447,8 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p) { //DBG_871X("r8711_net_set_mac_address(), MAC=%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3], //addr->sa_data[4], addr->sa_data[5]); - _rtw_memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN); - //_rtw_memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN); + memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN); + //memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN); //padapter->bset_hwaddr = true; } @@ -542,7 +542,7 @@ u16 rtw_recv_select_queue(struct sk_buff *skb, u32 priority; u8 *pdata = skb->data; - _rtw_memcpy(ð_type, pdata+(ETH_ALEN<<1), 2); + memcpy(ð_type, pdata+(ETH_ALEN<<1), 2); switch (be16_to_cpu(eth_type)) { case ETH_P_IP: @@ -1237,7 +1237,7 @@ static int _rtw_drv_register_netdev(struct adapter *padapter, char *name) /* alloc netdev name */ rtw_init_netdev_name(pnetdev, name); - _rtw_memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN); + memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN); /* Tell the network stack we exist */ if (register_netdev(pnetdev) != 0) { @@ -1845,7 +1845,7 @@ static int arp_query(unsigned char *haddr, u32 paddr, if (neighbor_entry != NULL) { neighbor_entry->used = jiffies; if (neighbor_entry->nud_state & NUD_VALID) { - _rtw_memcpy(haddr, neighbor_entry->ha, dev->addr_len); + memcpy(haddr, neighbor_entry->ha, dev->addr_len); ret = 1; } neigh_release(neighbor_entry); @@ -1901,7 +1901,7 @@ int rtw_gw_addr_query(struct adapter *padapter) pmlmepriv->gw_ip[1] = (gw_addr&0xff00)>>8; pmlmepriv->gw_ip[2] = (gw_addr&0xff0000)>>16; pmlmepriv->gw_ip[3] = (gw_addr&0xff000000)>>24; - _rtw_memcpy(pmlmepriv->gw_mac_addr, gw_mac, 6); + memcpy(pmlmepriv->gw_mac_addr, gw_mac, 6); DBG_871X("%s Gateway Mac:\t" MAC_FMT "\n", __FUNCTION__, MAC_ARG(pmlmepriv->gw_mac_addr)); DBG_871X("%s Gateway IP:\t" IP_FMT "\n", __FUNCTION__, IP_ARG(pmlmepriv->gw_ip)); } diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index cd21a71..d91e052 100755 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -570,11 +570,6 @@ void rtw_mfree2d(void *pbuf, int h, int w, int size) rtw_mfree((u8 *)pbuf, h*sizeof(void*) + w*h*size); } -void _rtw_memcpy(void* dst, void* src, u32 sz) -{ - memcpy(dst, src, sz); -} - int _rtw_memcmp(void *dst, void *src, u32 sz) { //under Linux/GNU/GLibc, the return value of memcmp for two same mem. chunk is 0 @@ -1237,7 +1232,7 @@ int rtw_change_ifname(struct adapter *padapter, const char *ifname) rtw_init_netdev_name(pnetdev, ifname); - _rtw_memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN); + memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) if(!rtnl_is_locked()) @@ -1313,7 +1308,7 @@ void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u32 src_len) dup = rtw_malloc(src_len); if (dup) { dup_len = src_len; - _rtw_memcpy(dup, src, dup_len); + memcpy(dup, src, dup_len); } keep_ori: diff --git a/os_dep/recv_linux.c b/os_dep/recv_linux.c index a03dafe..137d929 100755 --- a/os_dep/recv_linux.c +++ b/os_dep/recv_linux.c @@ -189,7 +189,7 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter,u8 bgroup) } ev.src_addr.sa_family = ARPHRD_ETHER; - _rtw_memcpy( ev.src_addr.sa_data, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); + memcpy( ev.src_addr.sa_data, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN ); _rtw_memset( &wrqu, 0x00, sizeof( wrqu ) ); wrqu.data.length = sizeof( ev ); diff --git a/os_dep/rtw_android.c b/os_dep/rtw_android.c index 69b3acd..68cb35f 100755 --- a/os_dep/rtw_android.c +++ b/os_dep/rtw_android.c @@ -296,7 +296,7 @@ static int rtw_android_get_p2p_dev_addr(struct net_device *net, char *command, i int bytes_written = 0; //We use the same address as our HW MAC address - _rtw_memcpy(command, net->dev_addr, ETH_ALEN); + memcpy(command, net->dev_addr, ETH_ALEN); bytes_written = ETH_ALEN; return bytes_written; diff --git a/os_dep/usb_ops_linux.c b/os_dep/usb_ops_linux.c index 533c42a..a220a7b 100755 --- a/os_dep/usb_ops_linux.c +++ b/os_dep/usb_ops_linux.c @@ -77,7 +77,7 @@ static int _usbctrl_vendorreq_async_write(struct usb_device *udev, u8 request, dr->wIndex = cpu_to_le16(index); dr->wLength = cpu_to_le16(len); - _rtw_memcpy(buf, pdata, len); + memcpy(buf, pdata, len); usb_fill_control_urb(urb, udev, pipe, (unsigned char *)dr, buf, len, _usbctrl_vendorreq_async_callback, buf); diff --git a/os_dep/xmit_linux.c b/os_dep/xmit_linux.c index 5e09c19..18f3c32 100755 --- a/os_dep/xmit_linux.c +++ b/os_dep/xmit_linux.c @@ -319,7 +319,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) newskb = rtw_skb_copy(skb); if (newskb) { - _rtw_memcpy(newskb->data, psta->hwaddr, 6); + memcpy(newskb->data, psta->hwaddr, 6); res = rtw_xmit(padapter, &newskb); if (res < 0) { DBG_871X("%s()-%d: rtw_xmit() return error!\n", __FUNCTION__, __LINE__);