From: Elliot Schwartz <[EMAIL PROTECTED]>
This is all unused.
Signed-off-by: Elliot Schwartz <[EMAIL PROTECTED]>
Signed-off-by: Jiri Benc <[EMAIL PROTECTED]>
---
include/net/d80211.h | 9 ---------
include/net/d80211_mgmt.h | 4 ----
include/net/d80211_shared.h | 4 +---
net/d80211/hostapd_ioctl.h | 1 -
net/d80211/ieee80211_sysfs_sta.c | 5 ++---
net/d80211/sta_info.h | 1 -
6 files changed, 3 insertions(+), 21 deletions(-)
6e353ac70959573dceff64137badeb170cec0709
diff --git a/include/net/d80211.h b/include/net/d80211.h
index a80f48b..6d91e13 100644
--- a/include/net/d80211.h
+++ b/include/net/d80211.h
@@ -82,7 +82,6 @@ struct ieee80211_hw_modes {
struct ieee80211_channel *channels;
int num_rates;
struct ieee80211_rate *rates;
- int xr_end; /* only used with Atheros XR */
};
struct ieee80211_tx_queue_params {
@@ -166,8 +165,6 @@ struct ieee80211_tx_control {
* transmission */
unsigned int fast_frame:1;
- unsigned int atheros_xr:1; /* only used with Atheros XR */
-
unsigned int power_level:8; /* per-packet transmit power level, in dBm
*/
unsigned int antenna_sel:4; /* 0 = default/diversity,
@@ -193,7 +190,6 @@ struct ieee80211_tx_control {
#define RX_FLAG_MMIC_ERROR 0x1
#define RX_FLAG_DECRYPTED 0x2
-#define RX_FLAG_XR_DOUBLE_CHIRP 0x4
/* Receive status. The low-level driver should provide this information
* (the subset supported by hardware) to the 802.11 code with each received
@@ -276,8 +272,6 @@ struct ieee80211_conf {
int atheros_super_ag_turbo_g;
int atheros_super_ag_turbo_prime;
- int atheros_xr;
-
/* Following five fields are used for IEEE 802.11H */
unsigned int radar_detect;
unsigned int spect_mgmt;
@@ -679,9 +673,6 @@ struct ieee80211_hw {
* needed only for IBSS mode and the result of this function is used to
* determine whether to reply to Probe Requests. */
int (*tx_last_beacon)(struct net_device *dev);
-
- /* Optional handler for XR-in-use notification. */
- int (*atheros_xr_in_use)(struct net_device *dev, int in_use);
};
/* Allocate a new hardware device. This must be called once for each
diff --git a/include/net/d80211_mgmt.h b/include/net/d80211_mgmt.h
index eb032de..87141d4 100644
--- a/include/net/d80211_mgmt.h
+++ b/include/net/d80211_mgmt.h
@@ -220,8 +220,4 @@ enum ieee80211_eid {
WLAN_EID_QOS_PARAMETER = 222
};
-
-
-#define ATHEROS_INFO_USEXR BIT(3)
-
#endif /* D802_11_MGMT_H */
diff --git a/include/net/d80211_shared.h b/include/net/d80211_shared.h
index 9dcb424..11569d1 100644
--- a/include/net/d80211_shared.h
+++ b/include/net/d80211_shared.h
@@ -21,8 +21,7 @@ enum {
MODE_ATHEROS_TURBOG = 4 /* Atheros Turbo mode (2x.11g at 2.4 GHz) */,
MODE_ATHEROS_PRIME = 5 /* Atheros Dynamic Turbo mode */,
MODE_ATHEROS_PRIMEG = 6 /* Atheros Dynamic Turbo mode G */,
- MODE_ATHEROS_XR = 7 /* Atheros XR mode */,
- NUM_IEEE80211_MODES = 8
+ NUM_IEEE80211_MODES = 7
};
#define IEEE80211_CHAN_W_SCAN 0x00000001
@@ -40,7 +39,6 @@ #define IEEE80211_RATE_OFDM 0x00000020
#define IEEE80211_RATE_CCK 0x00000040
#define IEEE80211_RATE_TURBO 0x00000080
#define IEEE80211_RATE_MANDATORY 0x00000100
-#define IEEE80211_RATE_XR 0x00000200
#define IEEE80211_RATE_CCK_2 (IEEE80211_RATE_CCK | IEEE80211_RATE_PREAMBLE2)
#define IEEE80211_RATE_MODULATION(f) \
diff --git a/net/d80211/hostapd_ioctl.h b/net/d80211/hostapd_ioctl.h
index d302790..fbd1088 100644
--- a/net/d80211/hostapd_ioctl.h
+++ b/net/d80211/hostapd_ioctl.h
@@ -186,7 +186,6 @@ struct prism2_hostapd_param {
* IEEE80211_ATHEROS_SUPER_AG
*/
u8 atheros_super_ag;
- u8 atheros_xr_mode;
u8 wds_flags;
#define IEEE80211_STA_DYNAMIC_ENC BIT(0)
u8 enc_flags;
diff --git a/net/d80211/ieee80211_sysfs_sta.c b/net/d80211/ieee80211_sysfs_sta.c
index 94c6dd8..d2067ef 100644
--- a/net/d80211/ieee80211_sysfs_sta.c
+++ b/net/d80211/ieee80211_sysfs_sta.c
@@ -77,7 +77,7 @@ STA_ATTR(wep_weak_iv_count, wep_weak_iv_
static ssize_t show_sta_flags(const struct sta_info *sta, char *buf)
{
- return sprintf(buf, "%s%s%s%s%s%s%s%s%s%s",
+ return sprintf(buf, "%s%s%s%s%s%s%s%s%s",
sta->flags & WLAN_STA_AUTH ? "AUTH\n" : "",
sta->flags & WLAN_STA_ASSOC ? "ASSOC\n" : "",
sta->flags & WLAN_STA_PS ? "PS\n" : "",
@@ -87,8 +87,7 @@ static ssize_t show_sta_flags(const stru
sta->flags & WLAN_STA_SHORT_PREAMBLE ?
"SHORT PREAMBLE\n" : "",
sta->flags & WLAN_STA_WME ? "WME\n" : "",
- sta->flags & WLAN_STA_WDS ? "WDS\n" : "",
- sta->flags & WLAN_STA_XR ? "XR\n" : "");
+ sta->flags & WLAN_STA_WDS ? "WDS\n" : "");
}
__STA_ATTR(flags);
diff --git a/net/d80211/sta_info.h b/net/d80211/sta_info.h
index ed1a104..44a532e 100644
--- a/net/d80211/sta_info.h
+++ b/net/d80211/sta_info.h
@@ -26,7 +26,6 @@ #define WLAN_STA_AUTHORIZED BIT(5) /* If
*/
#define WLAN_STA_SHORT_PREAMBLE BIT(7)
#define WLAN_STA_WME BIT(9)
-#define WLAN_STA_XR BIT(26)
#define WLAN_STA_WDS BIT(27)
--
1.3.0
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
