From: Leo Kim <leo.kim@xxxxxxxxx> This patch renames tWILCpfConnectResult to wilc_connect_result. Signed-off-by: Leo Kim <leo.kim@xxxxxxxxx> Signed-off-by: Tony Cho <tony.cho@xxxxxxxxx> --- drivers/staging/wilc1000/host_interface.c | 4 ++-- drivers/staging/wilc1000/host_interface.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index b9b57ca..2e2a7819 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -189,7 +189,7 @@ struct connect_attr { u8 *pu8IEs; size_t IEsLen; u8 u8security; - tWILCpfConnectResult pfConnectResult; + wilc_connect_result pfConnectResult; void *pvUserArg; AUTHTYPE_T tenuAuth_type; u8 u8channel; @@ -4999,7 +4999,7 @@ s32 host_int_get_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ScanSource) s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid, const u8 *pu8ssid, size_t ssidLen, const u8 *pu8IEs, size_t IEsLen, - tWILCpfConnectResult pfConnectResult, void *pvUserArg, + wilc_connect_result pfConnectResult, void *pvUserArg, u8 u8security, AUTHTYPE_T tenuAuth_type, u8 u8channel, void *pJoinParams) diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 458b1e1..bed8f98 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -184,7 +184,7 @@ typedef enum { typedef void (*wilc_scan_result)(tenuScanEvent, tstrNetworkInfo *, void *, void *); /*Connect callBack function definition*/ -typedef void (*tWILCpfConnectResult)(tenuConnDisconnEvent, +typedef void (*wilc_connect_result)(tenuConnDisconnEvent, tstrConnectInfo *, u8, tstrDisconnectNotifInfo *, @@ -245,7 +245,7 @@ typedef struct { u8 *pu8ConnReqIEs; size_t ConnReqIEsLen; /* Connect user call back function */ - tWILCpfConnectResult pfUserConnectResult; + wilc_connect_result pfUserConnectResult; bool IsHTCapable; /* User specific parameter to be delivered through the Connect User Callback function */ void *u32UserConnectPvoid; @@ -698,7 +698,7 @@ s32 host_int_get_start_scan_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8ScanSource); s32 host_int_set_join_req(tstrWILC_WFIDrv *hWFIDrv, u8 *pu8bssid, const u8 *pu8ssid, size_t ssidLen, const u8 *pu8IEs, size_t IEsLen, - tWILCpfConnectResult pfConnectResult, void *pvUserArg, + wilc_connect_result pfConnectResult, void *pvUserArg, u8 u8security, AUTHTYPE_T tenuAuth_type, u8 u8channel, void *pJoinParams); -- 1.9.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel