Commit ed3f0379 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: remove typedef from tenuConnDisconnEvent

This patch removes typedef from the enum tenuConnDisconnEvent and
renames it to conn_event.
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 200ac21b
...@@ -160,11 +160,11 @@ enum scan_event { ...@@ -160,11 +160,11 @@ enum scan_event {
SCAN_EVENT_FORCE_32BIT = 0xFFFFFFFF SCAN_EVENT_FORCE_32BIT = 0xFFFFFFFF
}; };
typedef enum { enum conn_event {
CONN_DISCONN_EVENT_CONN_RESP = 0, CONN_DISCONN_EVENT_CONN_RESP = 0,
CONN_DISCONN_EVENT_DISCONN_NOTIF = 1, CONN_DISCONN_EVENT_DISCONN_NOTIF = 1,
CONN_DISCONN_EVENT_FORCE_32BIT = 0xFFFFFFFF CONN_DISCONN_EVENT_FORCE_32BIT = 0xFFFFFFFF
} tenuConnDisconnEvent; };
enum KEY_TYPE { enum KEY_TYPE {
WEP, WEP,
...@@ -179,7 +179,7 @@ typedef void (*wilc_scan_result)(enum scan_event, tstrNetworkInfo *, ...@@ -179,7 +179,7 @@ typedef void (*wilc_scan_result)(enum scan_event, tstrNetworkInfo *,
void *, void *); void *, void *);
/*Connect callBack function definition*/ /*Connect callBack function definition*/
typedef void (*wilc_connect_result)(tenuConnDisconnEvent, typedef void (*wilc_connect_result)(enum conn_event,
tstrConnectInfo *, tstrConnectInfo *,
u8, u8,
tstrDisconnectNotifInfo *, tstrDisconnectNotifInfo *,
......
...@@ -531,7 +531,7 @@ int linux_wlan_set_bssid(struct net_device *wilc_netdev, u8 *pBSSID); ...@@ -531,7 +531,7 @@ int linux_wlan_set_bssid(struct net_device *wilc_netdev, u8 *pBSSID);
*/ */
int connecting; int connecting;
static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
tstrConnectInfo *pstrConnectInfo, tstrConnectInfo *pstrConnectInfo,
u8 u8MacStatus, u8 u8MacStatus,
tstrDisconnectNotifInfo *pstrDisconnectNotifInfo, tstrDisconnectNotifInfo *pstrDisconnectNotifInfo,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment