Commit d00d2ba3 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman

staging: wilc1000: use memcpy instead of WILC_memcpy

Use memcpy instead of WILC_memcpy that is a custom function.
Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 31126a47
...@@ -544,21 +544,21 @@ INLINE u8 get_from_ds(u8 *header) ...@@ -544,21 +544,21 @@ INLINE u8 get_from_ds(u8 *header)
/* header and updates the MAC Address in the allocated 'addr' variable. */ /* header and updates the MAC Address in the allocated 'addr' variable. */
INLINE void get_address1(u8 *pu8msa, u8 *addr) INLINE void get_address1(u8 *pu8msa, u8 *addr)
{ {
WILC_memcpy(addr, pu8msa + 4, 6); memcpy(addr, pu8msa + 4, 6);
} }
/* This function extracts the MAC Address in 'address2' field of the MAC */ /* This function extracts the MAC Address in 'address2' field of the MAC */
/* header and updates the MAC Address in the allocated 'addr' variable. */ /* header and updates the MAC Address in the allocated 'addr' variable. */
INLINE void get_address2(u8 *pu8msa, u8 *addr) INLINE void get_address2(u8 *pu8msa, u8 *addr)
{ {
WILC_memcpy(addr, pu8msa + 10, 6); memcpy(addr, pu8msa + 10, 6);
} }
/* This function extracts the MAC Address in 'address3' field of the MAC */ /* This function extracts the MAC Address in 'address3' field of the MAC */
/* header and updates the MAC Address in the allocated 'addr' variable. */ /* header and updates the MAC Address in the allocated 'addr' variable. */
INLINE void get_address3(u8 *pu8msa, u8 *addr) INLINE void get_address3(u8 *pu8msa, u8 *addr)
{ {
WILC_memcpy(addr, pu8msa + 16, 6); memcpy(addr, pu8msa + 16, 6);
} }
/* This function extracts the BSSID from the incoming WLAN packet based on */ /* This function extracts the BSSID from the incoming WLAN packet based on */
...@@ -863,7 +863,7 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo) ...@@ -863,7 +863,7 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo)
pstrNetworkInfo->pu8IEs = (u8 *)WILC_MALLOC(u16IEsLen); pstrNetworkInfo->pu8IEs = (u8 *)WILC_MALLOC(u16IEsLen);
memset((void *)(pstrNetworkInfo->pu8IEs), 0, u16IEsLen); memset((void *)(pstrNetworkInfo->pu8IEs), 0, u16IEsLen);
WILC_memcpy(pstrNetworkInfo->pu8IEs, pu8IEs, u16IEsLen); memcpy(pstrNetworkInfo->pu8IEs, pu8IEs, u16IEsLen);
} }
pstrNetworkInfo->u16IEsLen = u16IEsLen; pstrNetworkInfo->u16IEsLen = u16IEsLen;
...@@ -950,7 +950,7 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen, ...@@ -950,7 +950,7 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
pstrConnectRespInfo->pu8RespIEs = (u8 *)WILC_MALLOC(u16IEsLen); pstrConnectRespInfo->pu8RespIEs = (u8 *)WILC_MALLOC(u16IEsLen);
memset((void *)(pstrConnectRespInfo->pu8RespIEs), 0, u16IEsLen); memset((void *)(pstrConnectRespInfo->pu8RespIEs), 0, u16IEsLen);
WILC_memcpy(pstrConnectRespInfo->pu8RespIEs, pu8IEs, u16IEsLen); memcpy(pstrConnectRespInfo->pu8RespIEs, pu8IEs, u16IEsLen);
pstrConnectRespInfo->u16RespIEsLen = u16IEsLen; pstrConnectRespInfo->u16RespIEsLen = u16IEsLen;
} }
...@@ -1037,7 +1037,7 @@ s32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZ ...@@ -1037,7 +1037,7 @@ s32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZ
pu8BufferPtr += 2; pu8BufferPtr += 2;
for (j = 0; j < u32SurveyBytesLength; j += SURVEY_RESULT_LENGTH) { for (j = 0; j < u32SurveyBytesLength; j += SURVEY_RESULT_LENGTH) {
WILC_memcpy(&pstrSurveyResults[u32SurveyResultsCount], pu8BufferPtr, SURVEY_RESULT_LENGTH); memcpy(&pstrSurveyResults[u32SurveyResultsCount], pu8BufferPtr, SURVEY_RESULT_LENGTH);
pu8BufferPtr += SURVEY_RESULT_LENGTH; pu8BufferPtr += SURVEY_RESULT_LENGTH;
u32SurveyResultsCount++; u32SurveyResultsCount++;
} }
...@@ -1562,10 +1562,10 @@ s32 further_process_response(u8 *resp, ...@@ -1562,10 +1562,10 @@ s32 further_process_response(u8 *resp,
} }
case WID_STR: case WID_STR:
WILC_memcpy(cfg_str, resp + idx, cfg_len); memcpy(cfg_str, resp + idx, cfg_len);
/* cfg_str[cfg_len] = '\0'; //mostafa: no need currently for NULL termination */ /* cfg_str[cfg_len] = '\0'; //mostafa: no need currently for NULL termination */
if (pstrWIDresult->s32ValueSize >= cfg_len) { if (pstrWIDresult->s32ValueSize >= cfg_len) {
WILC_memcpy(pstrWIDresult->ps8WidVal, cfg_str, cfg_len); /* mostafa: no need currently for the extra NULL byte */ memcpy(pstrWIDresult->ps8WidVal, cfg_str, cfg_len); /* mostafa: no need currently for the extra NULL byte */
pstrWIDresult->s32ValueSize = cfg_len; pstrWIDresult->s32ValueSize = cfg_len;
} else { } else {
PRINT_ER("allocated WID buffer length is smaller than the received WID Length\n"); PRINT_ER("allocated WID buffer length is smaller than the received WID Length\n");
...@@ -1591,7 +1591,7 @@ s32 further_process_response(u8 *resp, ...@@ -1591,7 +1591,7 @@ s32 further_process_response(u8 *resp,
case WID_BIN_DATA: case WID_BIN_DATA:
if (pstrWIDresult->s32ValueSize >= cfg_len) { if (pstrWIDresult->s32ValueSize >= cfg_len) {
WILC_memcpy(pstrWIDresult->ps8WidVal, resp + idx, cfg_len); memcpy(pstrWIDresult->ps8WidVal, resp + idx, cfg_len);
pstrWIDresult->s32ValueSize = cfg_len; pstrWIDresult->s32ValueSize = cfg_len;
} else { } else {
PRINT_ER("Allocated WID buffer length is smaller than the received WID Length Err(%d)\n", retval); PRINT_ER("Allocated WID buffer length is smaller than the received WID Length Err(%d)\n", retval);
...@@ -1879,10 +1879,10 @@ s32 ConfigProvideResponse(char *pcRespBuffer, s32 s32RespLen) ...@@ -1879,10 +1879,10 @@ s32 ConfigProvideResponse(char *pcRespBuffer, s32 s32RespLen)
if (gstrConfigPktInfo.bRespRequired) { if (gstrConfigPktInfo.bRespRequired) {
if (s32RespLen <= gstrConfigPktInfo.s32MaxRespBuffLen) { if (s32RespLen <= gstrConfigPktInfo.s32MaxRespBuffLen) {
WILC_memcpy(gstrConfigPktInfo.pcRespBuffer, pcRespBuffer, s32RespLen); memcpy(gstrConfigPktInfo.pcRespBuffer, pcRespBuffer, s32RespLen);
gstrConfigPktInfo.s32BytesRead = s32RespLen; gstrConfigPktInfo.s32BytesRead = s32RespLen;
} else { } else {
WILC_memcpy(gstrConfigPktInfo.pcRespBuffer, pcRespBuffer, gstrConfigPktInfo.s32MaxRespBuffLen); memcpy(gstrConfigPktInfo.pcRespBuffer, pcRespBuffer, gstrConfigPktInfo.s32MaxRespBuffLen);
gstrConfigPktInfo.s32BytesRead = gstrConfigPktInfo.s32MaxRespBuffLen; gstrConfigPktInfo.s32BytesRead = gstrConfigPktInfo.s32MaxRespBuffLen;
PRINT_ER("BusProvideResponse() Response greater than the prepared Buffer Size\n"); PRINT_ER("BusProvideResponse() Response greater than the prepared Buffer Size\n");
} }
......
This diff is collapsed.
...@@ -2105,7 +2105,7 @@ static void wilc_set_multicast_list(struct net_device *dev) ...@@ -2105,7 +2105,7 @@ static void wilc_set_multicast_list(struct net_device *dev)
/* Store all of the multicast addresses in the hardware filter */ /* Store all of the multicast addresses in the hardware filter */
netdev_for_each_mc_addr(ha, dev) netdev_for_each_mc_addr(ha, dev)
{ {
WILC_memcpy(gau8MulticastMacAddrList[i], ha->addr, ETH_ALEN); memcpy(gau8MulticastMacAddrList[i], ha->addr, ETH_ALEN);
PRINT_D(INIT_DBG, "Entry[%d]: %x:%x:%x:%x:%x:%x\n", i, PRINT_D(INIT_DBG, "Entry[%d]: %x:%x:%x:%x:%x:%x\n", i,
gau8MulticastMacAddrList[i][0], gau8MulticastMacAddrList[i][1], gau8MulticastMacAddrList[i][2], gau8MulticastMacAddrList[i][3], gau8MulticastMacAddrList[i][4], gau8MulticastMacAddrList[i][5]); gau8MulticastMacAddrList[i][0], gau8MulticastMacAddrList[i][1], gau8MulticastMacAddrList[i][2], gau8MulticastMacAddrList[i][3], gau8MulticastMacAddrList[i][4], gau8MulticastMacAddrList[i][5]);
i++; i++;
......
...@@ -77,7 +77,7 @@ WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle, ...@@ -77,7 +77,7 @@ WILC_ErrNo WILC_MsgQueueSend(WILC_MsgQueueHandle *pHandle,
pstrMessage->pstrNext = NULL; pstrMessage->pstrNext = NULL;
pstrMessage->pvBuffer = WILC_MALLOC(u32SendBufferSize); pstrMessage->pvBuffer = WILC_MALLOC(u32SendBufferSize);
WILC_NULLCHECK(s32RetStatus, pstrMessage->pvBuffer); WILC_NULLCHECK(s32RetStatus, pstrMessage->pvBuffer);
WILC_memcpy(pstrMessage->pvBuffer, pvSendBuffer, u32SendBufferSize); memcpy(pstrMessage->pvBuffer, pvSendBuffer, u32SendBufferSize);
/* add it to the message queue */ /* add it to the message queue */
...@@ -170,7 +170,7 @@ WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle, ...@@ -170,7 +170,7 @@ WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle,
/* consume the message */ /* consume the message */
pHandle->u32ReceiversCount--; pHandle->u32ReceiversCount--;
WILC_memcpy(pvRecvBuffer, pstrMessage->pvBuffer, pstrMessage->u32Length); memcpy(pvRecvBuffer, pstrMessage->pvBuffer, pstrMessage->u32Length);
*pu32ReceivedLength = pstrMessage->u32Length; *pu32ReceivedLength = pstrMessage->u32Length;
pHandle->pstrMessageList = pstrMessage->pstrNext; pHandle->pstrMessageList = pstrMessage->pstrNext;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment