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

Commit 03e7b9c4 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove typedef from tstrStatistics 



This patch removes typedef from the struct tstrStatistics and
rename it to rf_info.

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 4ef4d195

drivers/staging/wilc1000/host_interface.c

+3 −3
Original line number Diff line number Diff line
@@ -2974,7 +2974,7 @@ static void Handle_GetLinkspeed(struct host_if_drv *drvHandler) 


}



s32 Handle_GetStatistics(struct host_if_drv *drvHandler, tstrStatistics *pstrStatistics)

s32 Handle_GetStatistics(struct host_if_drv *drvHandler, struct rf_info *pstrStatistics)

{

	struct wid strWIDList[5];

	u32 u32WidsCount = 0, s32Error = 0;
@@ -3987,7 +3987,7 @@ static int hostIFthread(void *pvArg) 
			break;



		case HOST_IF_MSG_GET_STATISTICS:

			Handle_GetStatistics(msg.drv, (tstrStatistics *)msg.body.data);

			Handle_GetStatistics(msg.drv, (struct rf_info *)msg.body.data);

			break;



		case HOST_IF_MSG_GET_CHNL:
@@ -5480,7 +5480,7 @@ s32 host_int_get_link_speed(struct host_if_drv *hWFIDrv, s8 *ps8lnkspd) 
	return s32Error;

}



s32 host_int_get_statistics(struct host_if_drv *hWFIDrv, tstrStatistics *pstrStatistics)

s32 host_int_get_statistics(struct host_if_drv *hWFIDrv, struct rf_info *pstrStatistics)

{

	s32 s32Error = 0;

	struct host_if_msg msg;

drivers/staging/wilc1000/host_interface.h

+3 −4
Original line number Diff line number Diff line
@@ -57,14 +57,13 @@ 
#define SCAN_EVENT_DONE_ABORTED

#define NUM_CONCURRENT_IFC			2



typedef struct _tstrStatistics {

struct rf_info {

	u8 u8LinkSpeed;

	s8 s8RSSI;

	u32 u32TxCount;

	u32 u32RxCount;

	u32 u32TxFailureCount;



} tstrStatistics;

};



enum host_if_state {

	HOST_IF_IDLE			= 0,
@@ -1176,6 +1175,6 @@ static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEven 


void host_int_freeJoinParams(void *pJoinParams);



s32 host_int_get_statistics(struct host_if_drv *hWFIDrv, tstrStatistics *pstrStatistics);

s32 host_int_get_statistics(struct host_if_drv *hWFIDrv, struct rf_info *pstrStatistics);



#endif

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+1 −1
Original line number Diff line number Diff line
@@ -1576,7 +1576,7 @@ static int get_station(struct wiphy *wiphy, struct net_device *dev, 
	}



	if (nic->iftype == STATION_MODE) {

		tstrStatistics strStatistics;

		struct rf_info strStatistics;



		host_int_get_statistics(priv->hWILCWFIDrv, &strStatistics);