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

Commit 4ff48570 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename pu8ReqIEs in struct connect_info 



This patch renames pu8ReqIEs to req_ies to avoid camelcase.

Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4a24e08

drivers/staging/wilc1000/coreconfigurator.h

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ struct connect_resp_info { 


struct connect_info {

	u8 bssid[6];

	u8 *pu8ReqIEs;

	u8 *req_ies;

	size_t ReqIEsLen;

	u8 *pu8RespIEs;

	u16 u16RespIEsLen;

drivers/staging/wilc1000/host_interface.c

+12 −12
Original line number Diff line number Diff line
@@ -1159,8 +1159,8 @@ static s32 Handle_Connect(struct wilc_vif *vif, 


			if (pstrHostIFconnectAttr->ies) {

				strConnectInfo.ReqIEsLen = pstrHostIFconnectAttr->ies_len;

				strConnectInfo.pu8ReqIEs = kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL);

				memcpy(strConnectInfo.pu8ReqIEs,

				strConnectInfo.req_ies = kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL);

				memcpy(strConnectInfo.req_ies,

				       pstrHostIFconnectAttr->ies,

				       pstrHostIFconnectAttr->ies_len);

			}
@@ -1171,8 +1171,8 @@ static s32 Handle_Connect(struct wilc_vif *vif, 
							       NULL,

							       pstrHostIFconnectAttr->arg);

			hif_drv->hif_state = HOST_IF_IDLE;

			kfree(strConnectInfo.pu8ReqIEs);

			strConnectInfo.pu8ReqIEs = NULL;

			kfree(strConnectInfo.req_ies);

			strConnectInfo.req_ies = NULL;



		} else {

			netdev_err(vif->ndev, "Connect callback is NULL\n");
@@ -1266,8 +1266,8 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif) 


		if (hif_drv->usr_conn_req.ies) {

			strConnectInfo.ReqIEsLen = hif_drv->usr_conn_req.ies_len;

			strConnectInfo.pu8ReqIEs = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL);

			memcpy(strConnectInfo.pu8ReqIEs,

			strConnectInfo.req_ies = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL);

			memcpy(strConnectInfo.req_ies,

			       hif_drv->usr_conn_req.ies,

			       hif_drv->usr_conn_req.ies_len);

		}
@@ -1278,8 +1278,8 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif) 
						  NULL,

						  hif_drv->usr_conn_req.arg);



		kfree(strConnectInfo.pu8ReqIEs);

		strConnectInfo.pu8ReqIEs = NULL;

		kfree(strConnectInfo.req_ies);

		strConnectInfo.req_ies = NULL;

	} else {

		netdev_err(vif->ndev, "Connect callback is NULL\n");

	}
@@ -1503,8 +1503,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, 


			if (hif_drv->usr_conn_req.ies) {

				strConnectInfo.ReqIEsLen = hif_drv->usr_conn_req.ies_len;

				strConnectInfo.pu8ReqIEs = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL);

				memcpy(strConnectInfo.pu8ReqIEs,

				strConnectInfo.req_ies = kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL);

				memcpy(strConnectInfo.req_ies,

				       hif_drv->usr_conn_req.ies,

				       hif_drv->usr_conn_req.ies_len);

			}
@@ -1533,8 +1533,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, 
			kfree(strConnectInfo.pu8RespIEs);

			strConnectInfo.pu8RespIEs = NULL;



			kfree(strConnectInfo.pu8ReqIEs);

			strConnectInfo.pu8ReqIEs = NULL;

			kfree(strConnectInfo.req_ies);

			strConnectInfo.req_ies = NULL;

			hif_drv->usr_conn_req.ssid_len = 0;

			kfree(hif_drv->usr_conn_req.ssid);

			hif_drv->usr_conn_req.ssid = NULL;

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent, 
		}



		cfg80211_connect_result(dev, pstrConnectInfo->bssid,

					pstrConnectInfo->pu8ReqIEs, pstrConnectInfo->ReqIEsLen,

					pstrConnectInfo->req_ies, pstrConnectInfo->ReqIEsLen,

					pstrConnectInfo->pu8RespIEs, pstrConnectInfo->u16RespIEsLen,

					u16ConnectStatus, GFP_KERNEL);

	} else if (enuConnDisconnEvent == CONN_DISCONN_EVENT_DISCONN_NOTIF)    {