mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-09 14:53:05 +00:00
rtl8188eu: Replace wrapper for memcpy
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
120368c717
commit
529328fd3d
30 changed files with 921 additions and 927 deletions
100
core/rtw_xmit.c
100
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue