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
128
core/rtw_p2p.c
128
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_len) ? sizeof(psta->dev_name):dev_name_len;
|
||||
|
||||
_rtw_memcpy(psta->dev_name, pattr_content+4, psta->dev_name_len);
|
||||
memcpy(psta->dev_name, pattr_content+4, psta->dev_name_len);
|
||||
}
|
||||
|
||||
rtw_mfree(pbuf, attr_contentlen);
|
||||
|
|
@ -2561,22 +2561,22 @@ u8 process_p2p_provdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
|
|||
{
|
||||
case WPS_CM_DISPLYA:
|
||||
{
|
||||
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "dis", 3 );
|
||||
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "dis", 3 );
|
||||
break;
|
||||
}
|
||||
case WPS_CM_LABEL:
|
||||
{
|
||||
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "lab", 3 );
|
||||
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "lab", 3 );
|
||||
break;
|
||||
}
|
||||
case WPS_CM_PUSH_BUTTON:
|
||||
{
|
||||
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pbc", 3 );
|
||||
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pbc", 3 );
|
||||
break;
|
||||
}
|
||||
case WPS_CM_KEYPAD:
|
||||
{
|
||||
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pad", 3 );
|
||||
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pad", 3 );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -2687,15 +2687,15 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
|
|||
|
||||
if ( wps_devicepassword_id == WPS_DPID_USER_SPEC )
|
||||
{
|
||||
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "dis", 3 );
|
||||
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "dis", 3 );
|
||||
}
|
||||
else if ( wps_devicepassword_id == WPS_DPID_REGISTRAR_SPEC )
|
||||
{
|
||||
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pad", 3 );
|
||||
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pad", 3 );
|
||||
}
|
||||
else
|
||||
{
|
||||
_rtw_memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pbc", 3 );
|
||||
memcpy( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pbc", 3 );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2789,8 +2789,8 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
|
|||
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
{
|
||||
// Store the group id information.
|
||||
_rtw_memcpy( pwdinfo->groupid_info.go_device_addr, pwdinfo->device_addr, ETH_ALEN );
|
||||
_rtw_memcpy( pwdinfo->groupid_info.ssid, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen );
|
||||
memcpy( pwdinfo->groupid_info.go_device_addr, pwdinfo->device_addr, ETH_ALEN );
|
||||
memcpy( pwdinfo->groupid_info.ssid, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3022,8 +3022,8 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
|
|||
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
{
|
||||
// Store the group id information.
|
||||
_rtw_memcpy( pwdinfo->groupid_info.go_device_addr, pwdinfo->device_addr, ETH_ALEN );
|
||||
_rtw_memcpy( pwdinfo->groupid_info.ssid, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen );
|
||||
memcpy( pwdinfo->groupid_info.go_device_addr, pwdinfo->device_addr, ETH_ALEN );
|
||||
memcpy( pwdinfo->groupid_info.ssid, pwdinfo->nego_ssid, pwdinfo->nego_ssidlen );
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -3098,8 +3098,8 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
|
|||
_rtw_memset( groupid, 0x00, 38 );
|
||||
if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen) )
|
||||
{
|
||||
_rtw_memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN );
|
||||
_rtw_memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN );
|
||||
memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN );
|
||||
memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN );
|
||||
}
|
||||
|
||||
//Get the next P2P IE
|
||||
|
|
@ -3197,8 +3197,8 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf
|
|||
if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen) )
|
||||
{
|
||||
DBG_871X( "[%s] Ssid = %s, ssidlen = %zu\n", __FUNCTION__, &groupid[ETH_ALEN], strlen(&groupid[ETH_ALEN]) );
|
||||
_rtw_memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN );
|
||||
_rtw_memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN );
|
||||
memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN );
|
||||
memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN );
|
||||
}
|
||||
|
||||
attr_contentlen = 0;
|
||||
|
|
@ -3243,7 +3243,7 @@ static void find_phase_handler( struct adapter* padapter )
|
|||
|
||||
|
||||
_rtw_memset((unsigned char*)&ssid, 0, sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memcpy(ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN );
|
||||
memcpy(ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN );
|
||||
ssid.SsidLength = P2P_WILDCARD_SSID_LEN;
|
||||
|
||||
rtw_p2p_set_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH);
|
||||
|
|
@ -3694,7 +3694,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
|
|||
if (nego_info->token != dialogToken)
|
||||
rtw_wdev_nego_info_init(nego_info);
|
||||
|
||||
_rtw_memcpy(nego_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN);
|
||||
memcpy(nego_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN);
|
||||
nego_info->active = tx ? 1 : 0;
|
||||
nego_info->token = dialogToken;
|
||||
nego_info->req_op_ch = op_ch;
|
||||
|
|
@ -3782,7 +3782,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
|
|||
if (invit_info->token != dialogToken)
|
||||
rtw_wdev_invit_info_init(invit_info);
|
||||
|
||||
_rtw_memcpy(invit_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN);
|
||||
memcpy(invit_info->peer_mac, tx ? GetAddr1Ptr(buf) : GetAddr2Ptr(buf), ETH_ALEN);
|
||||
invit_info->active = tx ? 1 : 0;
|
||||
invit_info->token = dialogToken;
|
||||
invit_info->flags = (flags==-1) ? 0x0 : flags;
|
||||
|
|
@ -4019,17 +4019,17 @@ void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength)
|
|||
{
|
||||
while(noa_offset < attr_contentlen)
|
||||
{
|
||||
//_rtw_memcpy(&wifidirect_info->noa_count[noa_num], &noa_attr[noa_offset], 1);
|
||||
//memcpy(&wifidirect_info->noa_count[noa_num], &noa_attr[noa_offset], 1);
|
||||
pwdinfo->noa_count[noa_num] = noa_attr[noa_offset];
|
||||
noa_offset += 1;
|
||||
|
||||
_rtw_memcpy(&pwdinfo->noa_duration[noa_num], &noa_attr[noa_offset], 4);
|
||||
memcpy(&pwdinfo->noa_duration[noa_num], &noa_attr[noa_offset], 4);
|
||||
noa_offset += 4;
|
||||
|
||||
_rtw_memcpy(&pwdinfo->noa_interval[noa_num], &noa_attr[noa_offset], 4);
|
||||
memcpy(&pwdinfo->noa_interval[noa_num], &noa_attr[noa_offset], 4);
|
||||
noa_offset += 4;
|
||||
|
||||
_rtw_memcpy(&pwdinfo->noa_start_time[noa_num], &noa_attr[noa_offset], 4);
|
||||
memcpy(&pwdinfo->noa_start_time[noa_num], &noa_attr[noa_offset], 4);
|
||||
noa_offset += 4;
|
||||
|
||||
noa_num++;
|
||||
|
|
@ -4340,10 +4340,10 @@ void rtw_init_wifidirect_addrs(struct adapter* padapter, u8 *dev_addr, u8 *iface
|
|||
|
||||
/*init device&interface address */
|
||||
if (dev_addr) {
|
||||
_rtw_memcpy(pwdinfo->device_addr, dev_addr, ETH_ALEN);
|
||||
memcpy(pwdinfo->device_addr, dev_addr, ETH_ALEN);
|
||||
}
|
||||
if (iface_addr) {
|
||||
_rtw_memcpy(pwdinfo->interface_addr, iface_addr, ETH_ALEN);
|
||||
memcpy(pwdinfo->interface_addr, iface_addr, ETH_ALEN);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -4395,7 +4395,7 @@ void init_wifidirect_info( struct adapter* padapter, enum P2P_ROLE role)
|
|||
pwdinfo->support_rate[6] = 0x60; // 48
|
||||
pwdinfo->support_rate[7] = 0x6c; // 54
|
||||
|
||||
_rtw_memcpy( ( void* ) pwdinfo->p2p_wildcard_ssid, "DIRECT-", 7 );
|
||||
memcpy( ( void* ) pwdinfo->p2p_wildcard_ssid, "DIRECT-", 7 );
|
||||
|
||||
_rtw_memset( pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN );
|
||||
pwdinfo->device_name_len = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue