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

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

staging: wilc1000: rename struct tstrDisconnectNotifInfo 



This patch renames struct tstrDisconnectNotifInfo to disconnect_info to
avoid camelcase.

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

drivers/staging/wilc1000/coreconfigurator.h

+2 −2
Original line number Diff line number Diff line
@@ -114,11 +114,11 @@ struct connect_info { 
	u16 status;

};



typedef struct {

struct disconnect_info {

	u16 u16reason;

	u8 *ie;

	size_t ie_len;

} tstrDisconnectNotifInfo;

};



s32 wilc_parse_network_info(u8 *msg_buffer,

			    struct network_info **ret_network_info);

drivers/staging/wilc1000/host_interface.c

+4 −4
Original line number Diff line number Diff line
@@ -1411,7 +1411,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, 
	u8 u8MacStatusReasonCode;

	u8 u8MacStatusAdditionalInfo;

	struct connect_info strConnectInfo;

	tstrDisconnectNotifInfo strDisconnectNotifInfo;

	struct disconnect_info strDisconnectNotifInfo;

	s32 s32Err = 0;

	struct host_if_drv *hif_drv = vif->hif_drv;
@@ -1545,7 +1545,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, 
			hif_drv->usr_conn_req.ies = NULL;

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

			   (hif_drv->hif_state == HOST_IF_CONNECTED)) {

			memset(&strDisconnectNotifInfo, 0, sizeof(tstrDisconnectNotifInfo));

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



			if (hif_drv->usr_scan_req.scan_result) {

				del_timer(&hif_drv->scan_timer);
@@ -1885,9 +1885,9 @@ static void Handle_Disconnect(struct wilc_vif *vif) 
	if (result) {

		netdev_err(vif->ndev, "Failed to send dissconect\n");

	} else {

		tstrDisconnectNotifInfo strDisconnectNotifInfo;

		struct disconnect_info strDisconnectNotifInfo;



		memset(&strDisconnectNotifInfo, 0, sizeof(tstrDisconnectNotifInfo));

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



		strDisconnectNotifInfo.u16reason = 0;

		strDisconnectNotifInfo.ie = NULL;

drivers/staging/wilc1000/host_interface.h

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

				     struct connect_info *,

				     u8,

				     tstrDisconnectNotifInfo *,

				     struct disconnect_info *,

				     void *);



typedef void (*wilc_remain_on_chan_expired)(void *, u32);

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ int wilc_connecting; 
static void CfgConnectResult(enum conn_event enuConnDisconnEvent,

			     struct connect_info *pstrConnectInfo,

			     u8 u8MacStatus,

			     tstrDisconnectNotifInfo *pstrDisconnectNotifInfo,

			     struct disconnect_info *pstrDisconnectNotifInfo,

			     void *pUserVoid)

{

	struct wilc_priv *priv;