Commit 607db447 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove typedef from tstrHiddenNetwork 



This patch removes typedef from the struct tstrHiddenNetwork.
And, rename it to hidden_network.

Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba1d1a69

drivers/staging/wilc1000/host_interface.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -169,7 +169,7 @@ struct scan_attr { 
	size_t IEsLen;

	size_t IEsLen;

	wilc_scan_result pfScanResult;

	wilc_scan_result pfScanResult;

	void *pvUserArg;

	void *pvUserArg;

	tstrHiddenNetwork strHiddenNetwork;

	struct hidden_network strHiddenNetwork;

};

};





/*!

/*!
@@ -5715,7 +5715,8 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource, 
			  u8 u8ScanType, u8 *pu8ChnlFreqList,

			  u8 u8ScanType, u8 *pu8ChnlFreqList,

			  u8 u8ChnlListLen, const u8 *pu8IEs,

			  u8 u8ChnlListLen, const u8 *pu8IEs,

			  size_t IEsLen, wilc_scan_result ScanResult,

			  size_t IEsLen, wilc_scan_result ScanResult,

			  void *pvUserArg, tstrHiddenNetwork  *pstrHiddenNetwork)

			  void *pvUserArg,

			  struct hidden_network *pstrHiddenNetwork)

{

{

	s32 s32Error = 0;

	s32 s32Error = 0;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;

	tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;

drivers/staging/wilc1000/host_interface.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -219,12 +219,11 @@ typedef struct _tstrHiddenNetworkInfo { 




} tstrHiddenNetworkInfo;

} tstrHiddenNetworkInfo;





typedef struct _tstrHiddenNetwork {

struct hidden_network {

	/* MAX_SSID_LEN */

	/* MAX_SSID_LEN */

	tstrHiddenNetworkInfo *pstrHiddenNetworkInfo;

	tstrHiddenNetworkInfo *pstrHiddenNetworkInfo;

	u8 u8ssidnum;

	u8 u8ssidnum;



};

} tstrHiddenNetwork;





typedef struct {

typedef struct {

	/* Scan user call back function */

	/* Scan user call back function */
@@ -873,7 +872,8 @@ s32 host_int_scan(tstrWILC_WFIDrv *hWFIDrv, u8 u8ScanSource, 
			  u8 u8ScanType, u8 *pu8ChnlFreqList,

			  u8 u8ScanType, u8 *pu8ChnlFreqList,

			  u8 u8ChnlListLen, const u8 *pu8IEs,

			  u8 u8ChnlListLen, const u8 *pu8IEs,

			  size_t IEsLen, wilc_scan_result ScanResult,

			  size_t IEsLen, wilc_scan_result ScanResult,

			  void *pvUserArg, tstrHiddenNetwork *pstrHiddenNetwork);

			  void *pvUserArg,

			  struct hidden_network *pstrHiddenNetwork);

/**

/**

 *  @brief              sets configuration wids values

 *  @brief              sets configuration wids values

 *  @details

 *  @details

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -698,7 +698,7 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) 
	u32 i;

	u32 i;

	s32 s32Error = 0;

	s32 s32Error = 0;

	u8 au8ScanChanList[MAX_NUM_SCANNED_NETWORKS];

	u8 au8ScanChanList[MAX_NUM_SCANNED_NETWORKS];

	tstrHiddenNetwork strHiddenNetwork;

	struct hidden_network strHiddenNetwork;





	priv = wiphy_priv(wiphy);

	priv = wiphy_priv(wiphy);
@@ -727,7 +727,7 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) 
		if (request->n_ssids >= 1) {

		if (request->n_ssids >= 1) {









			strHiddenNetwork.pstrHiddenNetworkInfo = kmalloc(request->n_ssids * sizeof(tstrHiddenNetwork), GFP_KERNEL);

			strHiddenNetwork.pstrHiddenNetworkInfo = kmalloc(request->n_ssids * sizeof(struct hidden_network), GFP_KERNEL);

			strHiddenNetwork.u8ssidnum = request->n_ssids;

			strHiddenNetwork.u8ssidnum = request->n_ssids;