Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33722ac7 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename pu8Buffer of struct rcvd_async_info 



This patch renames pu8Buffer of struct rcvd_async_info to buffer to
avoid CamelCase naming convention.

Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2bed2ca

drivers/staging/wilc1000/host_interface.c

+16 −17
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ struct connect_attr { 
};



struct rcvd_async_info {

	u8 *pu8Buffer;

	u8 *buffer;

	u32 u32Length;

};
@@ -1544,31 +1544,31 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv, 
		return -ENODEV;

	}

	PRINT_D(GENERIC_DBG, "Current State = %d,Received state = %d\n", hif_drv->enuHostIFstate,

		pstrRcvdGnrlAsyncInfo->pu8Buffer[7]);

		pstrRcvdGnrlAsyncInfo->buffer[7]);



	if ((hif_drv->enuHostIFstate == HOST_IF_WAITING_CONN_RESP) ||

	    (hif_drv->enuHostIFstate == HOST_IF_CONNECTED) ||

	    hif_drv->strWILC_UsrScanReq.pfUserScanResult) {

		if ((pstrRcvdGnrlAsyncInfo->pu8Buffer == NULL) ||

		if ((pstrRcvdGnrlAsyncInfo->buffer == NULL) ||

		    (hif_drv->strWILC_UsrConnReq.pfUserConnectResult == NULL)) {

			PRINT_ER("driver is null\n");

			return -EINVAL;

		}



		u8MsgType = pstrRcvdGnrlAsyncInfo->pu8Buffer[0];

		u8MsgType = pstrRcvdGnrlAsyncInfo->buffer[0];



		if ('I' != u8MsgType) {

			PRINT_ER("Received Message format incorrect.\n");

			return -EFAULT;

		}



		u8MsgID = pstrRcvdGnrlAsyncInfo->pu8Buffer[1];

		u16MsgLen = MAKE_WORD16(pstrRcvdGnrlAsyncInfo->pu8Buffer[2], pstrRcvdGnrlAsyncInfo->pu8Buffer[3]);

		u16WidID = MAKE_WORD16(pstrRcvdGnrlAsyncInfo->pu8Buffer[4], pstrRcvdGnrlAsyncInfo->pu8Buffer[5]);

		u8WidLen = pstrRcvdGnrlAsyncInfo->pu8Buffer[6];

		u8MacStatus  = pstrRcvdGnrlAsyncInfo->pu8Buffer[7];

		u8MacStatusReasonCode = pstrRcvdGnrlAsyncInfo->pu8Buffer[8];

		u8MacStatusAdditionalInfo = pstrRcvdGnrlAsyncInfo->pu8Buffer[9];

		u8MsgID = pstrRcvdGnrlAsyncInfo->buffer[1];

		u16MsgLen = MAKE_WORD16(pstrRcvdGnrlAsyncInfo->buffer[2], pstrRcvdGnrlAsyncInfo->buffer[3]);

		u16WidID = MAKE_WORD16(pstrRcvdGnrlAsyncInfo->buffer[4], pstrRcvdGnrlAsyncInfo->buffer[5]);

		u8WidLen = pstrRcvdGnrlAsyncInfo->buffer[6];

		u8MacStatus  = pstrRcvdGnrlAsyncInfo->buffer[7];

		u8MacStatusReasonCode = pstrRcvdGnrlAsyncInfo->buffer[8];

		u8MacStatusAdditionalInfo = pstrRcvdGnrlAsyncInfo->buffer[9];

		PRINT_INFO(HOSTINF_DBG, "Recieved MAC status = %d with Reason = %d , Info = %d\n", u8MacStatus, u8MacStatusReasonCode, u8MacStatusAdditionalInfo);

		if (hif_drv->enuHostIFstate == HOST_IF_WAITING_CONN_RESP) {

			u32 u32RcvdAssocRespInfoLen;
@@ -1750,9 +1750,9 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv, 


	}



	if (pstrRcvdGnrlAsyncInfo->pu8Buffer != NULL) {

		kfree(pstrRcvdGnrlAsyncInfo->pu8Buffer);

		pstrRcvdGnrlAsyncInfo->pu8Buffer = NULL;

	if (pstrRcvdGnrlAsyncInfo->buffer != NULL) {

		kfree(pstrRcvdGnrlAsyncInfo->buffer);

		pstrRcvdGnrlAsyncInfo->buffer = NULL;

	}



	return s32Error;
@@ -4484,9 +4484,8 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length) 




	msg.body.async_info.u32Length = u32Length;

	msg.body.async_info.pu8Buffer = kmalloc(u32Length, GFP_KERNEL);

	memcpy(msg.body.async_info.pu8Buffer,

		    pu8Buffer, u32Length);

	msg.body.async_info.buffer = kmalloc(u32Length, GFP_KERNEL);

	memcpy(msg.body.async_info.buffer, pu8Buffer, u32Length);



	s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));

	if (s32Error)