Merge branch 'master' into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
	net/wireless/nl80211.c

2 files changed, 0 insertions, 64 deletions

diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h
index e5b1c77ae0eb..973125242490 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.h
+++ b/drivers/net/wireless/ipw2x00/ipw2100.h
@@ -135,15 +135,6 @@ enum {
         IPW_HW_STATE_ENABLED = 0
 };
 
-struct ssid_context {
-        char ssid[IW_ESSID_MAX_SIZE + 1];
-        int ssid_len;
-        unsigned char bssid[ETH_ALEN];
-        int port_type;
-        int channel;
-
-};
-
 extern const char *port_type_str[];
 extern const char *band_str[];
 
diff --git a/drivers/net/wireless/ipw2x00/libipw.h b/drivers/net/wireless/ipw2x00/libipw.h
index 8874588fb929..0b22fb421735 100644
--- a/drivers/net/wireless/ipw2x00/libipw.h
+++ b/drivers/net/wireless/ipw2x00/libipw.h
@@ -584,61 +584,6 @@ struct libipw_tim_parameters {
 
 /*******************************************************/
 
-enum {                          /* libipw_basic_report.map */
-        LIBIPW_BASIC_MAP_BSS = (1 << 0),
-        LIBIPW_BASIC_MAP_OFDM = (1 << 1),
-        LIBIPW_BASIC_MAP_UNIDENTIFIED = (1 << 2),
-        LIBIPW_BASIC_MAP_RADAR = (1 << 3),
-        LIBIPW_BASIC_MAP_UNMEASURED = (1 << 4),
-        /* Bits 5-7 are reserved */
-
-};
-struct libipw_basic_report {
-        u8 channel;
-        __le64 start_time;
-        __le16 duration;
-        u8 map;
-} __packed;
-
-enum {                          /* libipw_measurement_request.mode */
-        /* Bit 0 is reserved */
-        LIBIPW_MEASUREMENT_ENABLE = (1 << 1),
-        LIBIPW_MEASUREMENT_REQUEST = (1 << 2),
-        LIBIPW_MEASUREMENT_REPORT = (1 << 3),
-        /* Bits 4-7 are reserved */
-};
-
-enum {
-        LIBIPW_REPORT_BASIC = 0,        /* required */
-        LIBIPW_REPORT_CCA = 1,  /* optional */
-        LIBIPW_REPORT_RPI = 2,  /* optional */
-        /* 3-255 reserved */
-};
-
-struct libipw_measurement_params {
-        u8 channel;
-        __le64 start_time;
-        __le16 duration;
-} __packed;
-
-struct libipw_measurement_request {
-        struct libipw_info_element ie;
-        u8 token;
-        u8 mode;
-        u8 type;
-        struct libipw_measurement_params params[0];
-} __packed;
-
-struct libipw_measurement_report {
-        struct libipw_info_element ie;
-        u8 token;
-        u8 mode;
-        u8 type;
-        union {
-                struct libipw_basic_report basic[0];
-        } u;
-} __packed;
-
 struct libipw_tpc_report {
         u8 transmit_power;
         u8 link_margin;