staging: r8188eu: remove some structure definitions from include/ieee80211.h

ieee_ibss_seq, rtw_ieee80211_hdr_qos, eapol, ieee80211_rx_stats,
ieee80211_frag_entry, ieee80211_stats, ieee80211_softmac_stats,
ieee80211_security, ieee80211_header_data, ieee80211_info_element_hdr,
ieee80211_info_element, ieee80211_authentication, ieee80211_probe_response,
ieee80211_probe_request, ieee80211_assoc_request_frame,
ieee80211_assoc_response_frame structures are not used.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/include/ieee80211.h b/drivers/staging/rtl8188eu/include/ieee80211.h
index b57f5d715eed2701ee5549c2460c923b7e7472e9..37a6f9d1f529627c7133292dd5f3dbb94f7efe1c 100644 (file)
--- a/drivers/staging/rtl8188eu/include/ieee80211.h
+++ b/drivers/staging/rtl8188eu/include/ieee80211.h
@@ -291,14 +291,6 @@ struct sta_data {
 /* this is stolen from ipw2200 driver */
 #define IEEE_IBSS_MAC_HASH_SIZE 31
 
-struct ieee_ibss_seq {
-       u8 mac[ETH_ALEN];
-       u16 seq_num;
-       u16 frag_num;
-       unsigned long packet_time;
-       struct list_head list;
-};
-
 struct rtw_ieee80211_hdr {
        __le16 frame_ctl;
        __le16 duration_id;
@@ -318,17 +310,6 @@ struct rtw_ieee80211_hdr_3addr {
        u16 seq_ctl;
 } __packed;
 
-struct rtw_ieee80211_hdr_qos {
-       __le16 frame_ctl;
-       __le16 duration_id;
-       u8 addr1[ETH_ALEN];
-       u8 addr2[ETH_ALEN];
-       u8 addr3[ETH_ALEN];
-       u16 seq_ctl;
-       u8 addr4[ETH_ALEN];
-       u16     qc;
-}  __packed;
-
 struct rtw_ieee80211_hdr_3addr_qos {
        __le16 frame_ctl;
        __le16 duration_id;
@@ -339,14 +320,6 @@ struct rtw_ieee80211_hdr_3addr_qos {
        u16     qc;
 }  __packed;
 
-struct eapol {
-       u8 snap[6];
-       u16 ethertype;
-       u8 version;
-       u8 type;
-       u16 length;
-} __packed;
-
 enum eap_type {
        EAP_PACKET = 0,
        EAPOL_START,
@@ -552,83 +525,12 @@ struct ieee80211_snap_hdr {
 #define IEEE80211_NUM_CCK_RATES                4
 #define IEEE80211_OFDM_SHIFT_MASK_A    4
 
-/* NOTE: This data is for statistical purposes; not all hardware provides this
- *       information for frames received.  Not setting these will not cause
- *       any adverse affects. */
-struct ieee80211_rx_stats {
-       /* u32 mac_time[2]; */
-       s8 rssi;
-       u8 signal;
-       u8 noise;
-       u8 received_channel;
-       u16 rate; /* in 100 kbps */
-       /* u8 control; */
-       u8 mask;
-       u8 freq;
-       u16 len;
-};
-
 /* IEEE 802.11 requires that STA supports concurrent reception of at least
  * three fragmented frames. This define can be increased to support more
  * concurrent frames, but it should be noted that each entry can consume about
  * 2 kB of RAM and increasing cache size will slow down frame reassembly. */
 #define IEEE80211_FRAG_CACHE_LEN 4
 
-struct ieee80211_frag_entry {
-       u32 first_frag_time;
-       uint seq;
-       uint last_frag;
-       uint qos;   /* jackson */
-       uint tid;       /* jackson */
-       struct sk_buff *skb;
-       u8 src_addr[ETH_ALEN];
-       u8 dst_addr[ETH_ALEN];
-};
-
-struct ieee80211_stats {
-       uint tx_unicast_frames;
-       uint tx_multicast_frames;
-       uint tx_fragments;
-       uint tx_unicast_octets;
-       uint tx_multicast_octets;
-       uint tx_deferred_transmissions;
-       uint tx_single_retry_frames;
-       uint tx_multiple_retry_frames;
-       uint tx_retry_limit_exceeded;
-       uint tx_discards;
-       uint rx_unicast_frames;
-       uint rx_multicast_frames;
-       uint rx_fragments;
-       uint rx_unicast_octets;
-       uint rx_multicast_octets;
-       uint rx_fcs_errors;
-       uint rx_discards_no_buffer;
-       uint tx_discards_wrong_sa;
-       uint rx_discards_undecryptable;
-       uint rx_message_in_msg_fragments;
-       uint rx_message_in_bad_msg_fragments;
-};
-
-struct ieee80211_softmac_stats {
-       uint rx_ass_ok;
-       uint rx_ass_err;
-       uint rx_probe_rq;
-       uint tx_probe_rs;
-       uint tx_beacons;
-       uint rx_auth_rq;
-       uint rx_auth_rs_ok;
-       uint rx_auth_rs_err;
-       uint tx_auth_rq;
-       uint no_auth_rs;
-       uint no_ass_rs;
-       uint tx_ass_rq;
-       uint rx_ass_rq;
-       uint tx_probe_rq;
-       uint reassoc;
-       uint swtxstop;
-       uint swtxawake;
-};
-
 #define SEC_KEY_1      (1<<0)
 #define SEC_KEY_2      (1<<1)
 #define SEC_KEY_3      (1<<2)
@@ -648,42 +550,6 @@ struct ieee80211_softmac_stats {
 #define WEP_KEYS 4
 #define WEP_KEY_LEN 13
 
-struct ieee80211_security {
-       u16 active_key:2,
-       enabled:1,
-       auth_mode:2,
-       auth_algo:4,
-       unicast_uses_group:1;
-       u8 key_sizes[WEP_KEYS];
-       u8 keys[WEP_KEYS][WEP_KEY_LEN];
-       u8 level;
-       u16 flags;
-} __packed;
-
-/*
-
- 802.11 data frame from AP
-
-      ,-------------------------------------------------------------------.
-Bytes |  2   |  2   |    6    |    6    |    6    |  2   | 0..2312 |   4  |
-      |------|------|---------|---------|---------|------|---------|------|
-Desc. | ctrl | dura |  DA/RA  |   TA    |    SA   | Sequ |  frame  |  fcs |
-      |      | tion | (BSSID) |         |       | ence |  data   |      |
-      `-------------------------------------------------------------------'
-
-Total: 28-2340 bytes
-
-*/
-
-struct ieee80211_header_data {
-       u16 frame_ctl;
-       u16 duration_id;
-       u8 addr1[6];
-       u8 addr2[6];
-       u8 addr3[6];
-       u16 seq_ctrl;
-};
-
 #define BEACON_PROBE_SSID_ID_POSITION 12
 
 /* Management Frame Information Element Types */
@@ -700,71 +566,9 @@ struct ieee80211_header_data {
 #define MFIE_TYPE_RATES_EX     50
 #define MFIE_TYPE_GENERIC      221
 
-struct ieee80211_info_element_hdr {
-       u8 id;
-       u8 len;
-} __packed;
-
-struct ieee80211_info_element {
-       u8 id;
-       u8 len;
-       u8 data[0];
-} __packed;
-
-/*
- * These are the data types that can make up management packets
- *
-       u16 auth_algorithm;
-       u16 auth_sequence;
-       u16 beacon_interval;
-       u16 capability;
-       u8 current_ap[ETH_ALEN];
-       u16 listen_interval;
-       struct {
-               u16 association_id:14, reserved:2;
-       } __packed;
-       u32 time_stamp[2];
-       u16 reason;
-       u16 status;
-*/
-
 #define IEEE80211_DEFAULT_TX_ESSID "Penguin"
 #define IEEE80211_DEFAULT_BASIC_RATE 10
 
-struct ieee80211_authentication {
-       struct ieee80211_header_data header;
-       u16 algorithm;
-       u16 transaction;
-       u16 status;
-       /* struct ieee80211_info_element_hdr info_element; */
-} __packed;
-
-struct ieee80211_probe_response {
-       struct ieee80211_header_data header;
-       u32 time_stamp[2];
-       u16 beacon_interval;
-       u16 capability;
-       struct ieee80211_info_element info_element;
-} __packed;
-
-struct ieee80211_probe_request {
-       struct ieee80211_header_data header;
-} __packed;
-
-struct ieee80211_assoc_request_frame {
-       struct rtw_ieee80211_hdr_3addr header;
-       u16 capability;
-       u16 listen_interval;
-       struct ieee80211_info_element_hdr info_element;
-} __packed;
-
-struct ieee80211_assoc_response_frame {
-       struct rtw_ieee80211_hdr_3addr header;
-       u16 capability;
-       u16 status;
-       u16 aid;
-} __packed;
-
 struct ieee80211_txb {
        u8 nr_frags;
        u8 encrypted;