From b7afe350320bde88f6d0b712205feb71b2437a31 Mon Sep 17 00:00:00 2001 From: Ajay Singh Date: Sun, 2 Dec 2018 18:03:14 +0000 Subject: [PATCH] staging: wilc1000: delete the unused code after code refactor After code refactor some of the macro and variables are not required any more, so deleted the unused code. Signed-off-by: Ajay Singh Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/host_interface.c | 31 ----------------------- drivers/staging/wilc1000/host_interface.h | 27 -------------------- 2 files changed, 58 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 596a321c8d5e..71395d8a93b1 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -13,30 +13,6 @@ #define REAL_JOIN_REQ 0 -struct host_if_wpa_attr { - u8 *key; - const u8 *mac_addr; - u8 *seq; - u8 seq_len; - u8 index; - u8 key_len; - u8 mode; -}; - -struct host_if_wep_attr { - u8 *key; - u8 key_len; - u8 index; - u8 mode; - enum authtype auth_type; -}; - -union host_if_key_attr { - struct host_if_wep_attr wep; - struct host_if_wpa_attr wpa; - struct host_if_pmkid_attr pmkid; -}; - struct scan_attr { u8 src; u8 type; @@ -121,20 +97,13 @@ struct wilc_gtk_key { u8 key[0]; } __packed; -struct set_ip_addr { - u8 *ip_addr; - u8 idx; -}; - union message_body { struct scan_attr scan_info; struct connect_attr con_info; struct rcvd_net_info net_info; struct rcvd_async_info async_info; - struct set_ip_addr ip_info; struct set_multicast multicast_info; struct get_mac_addr get_mac_info; - struct ba_session_info session_info; struct remain_ch remain_on_ch; char *data; }; diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 477372bce87d..d2f29ea80745 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -17,13 +17,6 @@ enum { WILC_CLIENT_MODE = 0x4 }; -enum { - WILC_ADD_KEY = 0x1, - WILC_REMOVE_KEY = 0x2, - WILC_DEFAULT_KEY = 0x4, - WILC_ADD_KEY_AP = 0x8 -}; - #define WILC_MAX_NUM_STA 9 #define MAX_NUM_SCANNED_NETWORKS 100 #define MAX_NUM_SCANNED_NETWORKS_SHADOW 130 @@ -31,16 +24,10 @@ enum { #define TX_MIC_KEY_LEN 8 #define RX_MIC_KEY_LEN 8 -#define PTK_KEY_LEN 16 -#define RX_MIC_KEY_MSG_LEN 48 -#define PTK_KEY_MSG_LEN 39 - -#define PMKSA_KEY_LEN 22 #define WILC_MAX_NUM_PMKIDS 16 #define WILC_ADD_STA_LENGTH 40 #define WILC_NUM_CONCURRENT_IFC 2 -#define WILC_DRV_HANDLER_SIZE 5 #define NUM_RSSI 5 @@ -160,13 +147,6 @@ enum conn_event { CONN_DISCONN_EVENT_FORCE_32BIT = 0xFFFFFFFF }; -enum KEY_TYPE { - WILC_KEY_TYPE_WEP, - WILC_KEY_TYPE_WPA_RX_GTK, - WILC_KEY_TYPE_WPA_PTK, - WILC_KEY_TYPE_PMKSA, -}; - typedef void (*wilc_scan_result)(enum scan_event, struct network_info *, void *, void *); @@ -218,13 +198,6 @@ struct get_mac_addr { u8 *mac_addr; }; -struct ba_session_info { - u8 bssid[ETH_ALEN]; - u8 tid; - u16 buf_size; - u16 time_out; -}; - struct remain_ch { u16 ch; u32 duration; -- 2.30.2