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

Commit f3a46b0f authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename variables using camelCase in handle_rcvd_gnrl_async_info() 



Fix 'Avoid camelCase' issue found by checkpatch.pl script.

Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88be64aa

drivers/staging/wilc1000/host_interface.c

+43 −43
Original line number Original line Diff line number Diff line
@@ -1343,17 +1343,17 @@ static s32 handle_rcvd_gnrl_async_info(struct wilc_vif *vif, 
				       struct rcvd_async_info *rcvd_info)

				       struct rcvd_async_info *rcvd_info)

{

{

	s32 result = 0;

	s32 result = 0;

	u8 u8MsgType = 0;

	u8 msg_type = 0;

	u8 u8MsgID = 0;

	u8 msg_id = 0;

	u16 u16MsgLen = 0;

	u16 msg_len = 0;

	u16 u16WidID = (u16)WID_NIL;

	u16 wid_id = (u16)WID_NIL;

	u8 u8WidLen  = 0;

	u8 wid_len  = 0;

	u8 u8MacStatus;

	u8 mac_status;

	u8 u8MacStatusReasonCode;

	u8 mac_status_reason_code;

	u8 u8MacStatusAdditionalInfo;

	u8 mac_status_additional_info;

	struct connect_info conn_info;

	struct connect_info conn_info;

	struct disconnect_info disconn_info;

	struct disconnect_info disconn_info;

	s32 s32Err = 0;

	s32 err = 0;

	struct host_if_drv *hif_drv = vif->hif_drv;

	struct host_if_drv *hif_drv = vif->hif_drv;





	if (!hif_drv) {

	if (!hif_drv) {
@@ -1370,62 +1370,62 @@ static s32 handle_rcvd_gnrl_async_info(struct wilc_vif *vif, 
			return -EINVAL;

			return -EINVAL;

		}

		}





		u8MsgType = rcvd_info->buffer[0];

		msg_type = rcvd_info->buffer[0];





		if ('I' != u8MsgType) {

		if ('I' != msg_type) {

			netdev_err(vif->ndev, "Received Message incorrect.\n");

			netdev_err(vif->ndev, "Received Message incorrect.\n");

			return -EFAULT;

			return -EFAULT;

		}

		}





		u8MsgID = rcvd_info->buffer[1];

		msg_id = rcvd_info->buffer[1];

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

		msg_len = MAKE_WORD16(rcvd_info->buffer[2], rcvd_info->buffer[3]);

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

		wid_id = MAKE_WORD16(rcvd_info->buffer[4], rcvd_info->buffer[5]);

		u8WidLen = rcvd_info->buffer[6];

		wid_len = rcvd_info->buffer[6];

		u8MacStatus  = rcvd_info->buffer[7];

		mac_status  = rcvd_info->buffer[7];

		u8MacStatusReasonCode = rcvd_info->buffer[8];

		mac_status_reason_code = rcvd_info->buffer[8];

		u8MacStatusAdditionalInfo = rcvd_info->buffer[9];

		mac_status_additional_info = rcvd_info->buffer[9];

		if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) {

		if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) {

			u32 u32RcvdAssocRespInfoLen = 0;

			u32 rcvd_assoc_resp_info_len = 0;

			struct connect_resp_info *pstrConnectRespInfo = NULL;

			struct connect_resp_info *connect_resp_info = NULL;





			memset(&conn_info, 0, sizeof(struct connect_info));

			memset(&conn_info, 0, sizeof(struct connect_info));





			if (u8MacStatus == MAC_CONNECTED) {

			if (mac_status == MAC_CONNECTED) {

				memset(rcv_assoc_resp, 0, MAX_ASSOC_RESP_FRAME_SIZE);

				memset(rcv_assoc_resp, 0, MAX_ASSOC_RESP_FRAME_SIZE);





				host_int_get_assoc_res_info(vif,

				host_int_get_assoc_res_info(vif,

							    rcv_assoc_resp,

							    rcv_assoc_resp,

							    MAX_ASSOC_RESP_FRAME_SIZE,

							    MAX_ASSOC_RESP_FRAME_SIZE,

							    &u32RcvdAssocRespInfoLen);

							    &rcvd_assoc_resp_info_len);





				if (u32RcvdAssocRespInfoLen != 0) {

				if (rcvd_assoc_resp_info_len != 0) {

					s32Err = wilc_parse_assoc_resp_info(rcv_assoc_resp, u32RcvdAssocRespInfoLen,

					err = wilc_parse_assoc_resp_info(rcv_assoc_resp, rcvd_assoc_resp_info_len,

									    &pstrConnectRespInfo);

									 &connect_resp_info);

					if (s32Err) {

					if (err) {

						netdev_err(vif->ndev, "wilc_parse_assoc_resp_info() returned error %d\n", s32Err);

						netdev_err(vif->ndev, "wilc_parse_assoc_resp_info() returned error %d\n", err);

					} else {

					} else {

						conn_info.status = pstrConnectRespInfo->status;

						conn_info.status = connect_resp_info->status;





						if (conn_info.status == SUCCESSFUL_STATUSCODE && pstrConnectRespInfo->ies) {

						if (conn_info.status == SUCCESSFUL_STATUSCODE && connect_resp_info->ies) {

							conn_info.resp_ies_len = pstrConnectRespInfo->ies_len;

							conn_info.resp_ies_len = connect_resp_info->ies_len;

							conn_info.resp_ies = kmalloc(pstrConnectRespInfo->ies_len, GFP_KERNEL);

							conn_info.resp_ies = kmalloc(connect_resp_info->ies_len, GFP_KERNEL);

							memcpy(conn_info.resp_ies, pstrConnectRespInfo->ies,

							memcpy(conn_info.resp_ies, connect_resp_info->ies,

							       pstrConnectRespInfo->ies_len);

							       connect_resp_info->ies_len);

						}

						}





						if (pstrConnectRespInfo) {

						if (connect_resp_info) {

							kfree(pstrConnectRespInfo->ies);

							kfree(connect_resp_info->ies);

							kfree(pstrConnectRespInfo);

							kfree(connect_resp_info);

						}

						}

					}

					}

				}

				}

			}

			}





			if (u8MacStatus == MAC_CONNECTED &&

			if (mac_status == MAC_CONNECTED &&

			    conn_info.status != SUCCESSFUL_STATUSCODE)	{

			    conn_info.status != SUCCESSFUL_STATUSCODE)	{

				netdev_err(vif->ndev, "Received MAC status is MAC_CONNECTED while the received status code in Asoc Resp is not SUCCESSFUL_STATUSCODE\n");

				netdev_err(vif->ndev, "Received MAC status is MAC_CONNECTED while the received status code in Asoc Resp is not SUCCESSFUL_STATUSCODE\n");

				eth_zero_addr(wilc_connected_ssid);

				eth_zero_addr(wilc_connected_ssid);

			} else if (u8MacStatus == MAC_DISCONNECTED)    {

			} else if (mac_status == MAC_DISCONNECTED)    {

				netdev_err(vif->ndev, "Received MAC status is MAC_DISCONNECTED\n");

				netdev_err(vif->ndev, "Received MAC status is MAC_DISCONNECTED\n");

				eth_zero_addr(wilc_connected_ssid);

				eth_zero_addr(wilc_connected_ssid);

			}

			}
@@ -1433,7 +1433,7 @@ static s32 handle_rcvd_gnrl_async_info(struct wilc_vif *vif, 
			if (hif_drv->usr_conn_req.bssid) {

			if (hif_drv->usr_conn_req.bssid) {

				memcpy(conn_info.bssid, hif_drv->usr_conn_req.bssid, 6);

				memcpy(conn_info.bssid, hif_drv->usr_conn_req.bssid, 6);





				if (u8MacStatus == MAC_CONNECTED &&

				if (mac_status == MAC_CONNECTED &&

				    conn_info.status == SUCCESSFUL_STATUSCODE)	{

				    conn_info.status == SUCCESSFUL_STATUSCODE)	{

					memcpy(hif_drv->assoc_bssid,

					memcpy(hif_drv->assoc_bssid,

					       hif_drv->usr_conn_req.bssid, ETH_ALEN);

					       hif_drv->usr_conn_req.bssid, ETH_ALEN);
@@ -1451,11 +1451,11 @@ static s32 handle_rcvd_gnrl_async_info(struct wilc_vif *vif, 
			del_timer(&hif_drv->connect_timer);

			del_timer(&hif_drv->connect_timer);

			hif_drv->usr_conn_req.conn_result(CONN_DISCONN_EVENT_CONN_RESP,

			hif_drv->usr_conn_req.conn_result(CONN_DISCONN_EVENT_CONN_RESP,

							  &conn_info,

							  &conn_info,

							  u8MacStatus,

							  mac_status,

							  NULL,

							  NULL,

							  hif_drv->usr_conn_req.arg);

							  hif_drv->usr_conn_req.arg);





			if (u8MacStatus == MAC_CONNECTED &&

			if (mac_status == MAC_CONNECTED &&

			    conn_info.status == SUCCESSFUL_STATUSCODE)	{

			    conn_info.status == SUCCESSFUL_STATUSCODE)	{

				wilc_set_power_mgmt(vif, 0, 0);

				wilc_set_power_mgmt(vif, 0, 0);
@@ -1482,7 +1482,7 @@ static s32 handle_rcvd_gnrl_async_info(struct wilc_vif *vif, 
			hif_drv->usr_conn_req.ies_len = 0;

			hif_drv->usr_conn_req.ies_len = 0;

			kfree(hif_drv->usr_conn_req.ies);

			kfree(hif_drv->usr_conn_req.ies);

			hif_drv->usr_conn_req.ies = NULL;

			hif_drv->usr_conn_req.ies = NULL;

		} else if ((u8MacStatus == MAC_DISCONNECTED) &&

		} else if ((mac_status == MAC_DISCONNECTED) &&

			   (hif_drv->hif_state == HOST_IF_CONNECTED)) {

			   (hif_drv->hif_state == HOST_IF_CONNECTED)) {

			memset(&disconn_info, 0, sizeof(struct disconnect_info));

			memset(&disconn_info, 0, sizeof(struct disconnect_info));
@@ -1532,7 +1532,7 @@ static s32 handle_rcvd_gnrl_async_info(struct wilc_vif *vif, 
			hif_drv->hif_state = HOST_IF_IDLE;

			hif_drv->hif_state = HOST_IF_IDLE;

			scan_while_connected = false;

			scan_while_connected = false;





		} else if ((u8MacStatus == MAC_DISCONNECTED) &&

		} else if ((mac_status == MAC_DISCONNECTED) &&

			   (hif_drv->usr_scan_req.scan_result)) {

			   (hif_drv->usr_scan_req.scan_result)) {

			del_timer(&hif_drv->scan_timer);

			del_timer(&hif_drv->scan_timer);

			if (hif_drv->usr_scan_req.scan_result)

			if (hif_drv->usr_scan_req.scan_result)