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

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

staging: wilc1000: rename u16reason in disconnect_info 



This patch renames u16reason to reason to remove u16 prefix. There is no
need to use prefix to show data type.

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

drivers/staging/wilc1000/coreconfigurator.h

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ struct connect_info { 
};



struct disconnect_info {

	u16 u16reason;

	u16 reason;

	u8 *ie;

	size_t ie_len;

};

drivers/staging/wilc1000/host_interface.c

+2 −2
Original line number Diff line number Diff line
@@ -1552,7 +1552,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, 
				Handle_ScanDone(vif, SCAN_EVENT_ABORTED);

			}



			strDisconnectNotifInfo.u16reason = 0;

			strDisconnectNotifInfo.reason = 0;

			strDisconnectNotifInfo.ie = NULL;

			strDisconnectNotifInfo.ie_len = 0;
@@ -1889,7 +1889,7 @@ static void Handle_Disconnect(struct wilc_vif *vif) 


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



		strDisconnectNotifInfo.u16reason = 0;

		strDisconnectNotifInfo.reason = 0;

		strDisconnectNotifInfo.ie = NULL;

		strDisconnectNotifInfo.ie_len = 0;

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+3 −3
Original line number Diff line number Diff line
@@ -559,11 +559,11 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent, 
		if (!pstrWFIDrv->p2p_connect)

			wlan_channel = INVALID_CHANNEL;

		if ((pstrWFIDrv->IFC_UP) && (dev == wl->vif[1]->ndev)) {

			pstrDisconnectNotifInfo->u16reason = 3;

			pstrDisconnectNotifInfo->reason = 3;

		} else if ((!pstrWFIDrv->IFC_UP) && (dev == wl->vif[1]->ndev)) {

			pstrDisconnectNotifInfo->u16reason = 1;

			pstrDisconnectNotifInfo->reason = 1;

		}

		cfg80211_disconnected(dev, pstrDisconnectNotifInfo->u16reason, pstrDisconnectNotifInfo->ie,

		cfg80211_disconnected(dev, pstrDisconnectNotifInfo->reason, pstrDisconnectNotifInfo->ie,

				      pstrDisconnectNotifInfo->ie_len, false,

				      GFP_KERNEL);

	}