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

Commit 3b0437e1 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename struct tstrConnectInfo 



This patch renames struct tstrConnectInfo to connect_info to avoid
camelcase and removes typedef.

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

drivers/staging/wilc1000/coreconfigurator.h

+2 −2
Original line number Diff line number Diff line
@@ -105,14 +105,14 @@ struct connect_resp_info { 
	u16 ies_len;

};



typedef struct {

struct connect_info {

	u8 au8bssid[6];

	u8 *pu8ReqIEs;

	size_t ReqIEsLen;

	u8 *pu8RespIEs;

	u16 u16RespIEsLen;

	u16 u16ConnectStatus;

} tstrConnectInfo;

};



typedef struct {

	u16 u16reason;

drivers/staging/wilc1000/host_interface.c

+6 −6
Original line number Diff line number Diff line
@@ -1147,11 +1147,11 @@ static s32 Handle_Connect(struct wilc_vif *vif, 


ERRORHANDLER:

	if (result) {

		tstrConnectInfo strConnectInfo;

		struct connect_info strConnectInfo;



		del_timer(&hif_drv->connect_timer);



		memset(&strConnectInfo, 0, sizeof(tstrConnectInfo));

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



		if (pstrHostIFconnectAttr->result) {

			if (pstrHostIFconnectAttr->bssid)
@@ -1242,7 +1242,7 @@ static s32 Handle_FlushConnect(struct wilc_vif *vif) 
static s32 Handle_ConnectTimeout(struct wilc_vif *vif)

{

	s32 result = 0;

	tstrConnectInfo strConnectInfo;

	struct connect_info strConnectInfo;

	struct wid wid;

	u16 u16DummyReasonCode = 0;

	struct host_if_drv *hif_drv = vif->hif_drv;
@@ -1256,7 +1256,7 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif) 


	scan_while_connected = false;



	memset(&strConnectInfo, 0, sizeof(tstrConnectInfo));

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



	if (hif_drv->usr_conn_req.conn_result) {

		if (hif_drv->usr_conn_req.bssid) {
@@ -1410,7 +1410,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, 
	u8 u8MacStatus;

	u8 u8MacStatusReasonCode;

	u8 u8MacStatusAdditionalInfo;

	tstrConnectInfo strConnectInfo;

	struct connect_info strConnectInfo;

	tstrDisconnectNotifInfo strDisconnectNotifInfo;

	s32 s32Err = 0;

	struct host_if_drv *hif_drv = vif->hif_drv;
@@ -1447,7 +1447,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, 
			u32 u32RcvdAssocRespInfoLen = 0;

			struct connect_resp_info *pstrConnectRespInfo = NULL;



			memset(&strConnectInfo, 0, sizeof(tstrConnectInfo));

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



			if (u8MacStatus == MAC_CONNECTED) {

				memset(rcv_assoc_resp, 0, MAX_ASSOC_RESP_FRAME_SIZE);

drivers/staging/wilc1000/host_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ typedef void (*wilc_scan_result)(enum scan_event, struct network_info *, 
				 void *, void *);



typedef void (*wilc_connect_result)(enum conn_event,

				     tstrConnectInfo *,

				     struct connect_info *,

				     u8,

				     tstrDisconnectNotifInfo *,

				     void *);

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static void CfgScanResult(enum scan_event scan_event, 
int wilc_connecting;



static void CfgConnectResult(enum conn_event enuConnDisconnEvent,

			     tstrConnectInfo *pstrConnectInfo,

			     struct connect_info *pstrConnectInfo,

			     u8 u8MacStatus,

			     tstrDisconnectNotifInfo *pstrDisconnectNotifInfo,

			     void *pUserVoid)