aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-09-14 11:10:25 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:27 -0400
commitb708e610622cff07f4374a2b4410884f964b8489 (patch)
tree77aee49d680178df819437a35ba23cce9ad14e18 /include/net/mac80211.h
parentd4e46a3d9869563c6210b01bb651c40cbe65da80 (diff)
[MAC80211]: remove turbo modes
This patch removes all mention of the atheros turbo modes that can't possibly work properly anyway since in some places we don't check for them when we should. I have no idea what the iwlwifi drivers were doing with these but it can't possibly have been correct. Cc: Zhu Yi <yi.zhu@intel.com> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Michael Wu <flamingice@sourmilk.net> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index ec8c7393956b..fcb7e3f9c669 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -73,14 +73,13 @@ struct ieee80211_channel {
73#define IEEE80211_RATE_SUPPORTED 0x00000010 73#define IEEE80211_RATE_SUPPORTED 0x00000010
74#define IEEE80211_RATE_OFDM 0x00000020 74#define IEEE80211_RATE_OFDM 0x00000020
75#define IEEE80211_RATE_CCK 0x00000040 75#define IEEE80211_RATE_CCK 0x00000040
76#define IEEE80211_RATE_TURBO 0x00000080
77#define IEEE80211_RATE_MANDATORY 0x00000100 76#define IEEE80211_RATE_MANDATORY 0x00000100
78 77
79#define IEEE80211_RATE_CCK_2 (IEEE80211_RATE_CCK | IEEE80211_RATE_PREAMBLE2) 78#define IEEE80211_RATE_CCK_2 (IEEE80211_RATE_CCK | IEEE80211_RATE_PREAMBLE2)
80#define IEEE80211_RATE_MODULATION(f) \ 79#define IEEE80211_RATE_MODULATION(f) \
81 (f & (IEEE80211_RATE_CCK | IEEE80211_RATE_OFDM)) 80 (f & (IEEE80211_RATE_CCK | IEEE80211_RATE_OFDM))
82 81
83/* Low-level driver should set PREAMBLE2, OFDM, CCK, and TURBO flags. 82/* Low-level driver should set PREAMBLE2, OFDM and CCK flags.
84 * BASIC, SUPPORTED, ERP, and MANDATORY flags are set in 80211.o based on the 83 * BASIC, SUPPORTED, ERP, and MANDATORY flags are set in 80211.o based on the
85 * configuration. */ 84 * configuration. */
86struct ieee80211_rate { 85struct ieee80211_rate {
@@ -101,12 +100,10 @@ struct ieee80211_rate {
101 100
102/* 802.11g is backwards-compatible with 802.11b, so a wlan card can 101/* 802.11g is backwards-compatible with 802.11b, so a wlan card can
103 * actually be both in 11b and 11g modes at the same time. */ 102 * actually be both in 11b and 11g modes at the same time. */
104enum { 103enum ieee80211_phymode {
105 MODE_IEEE80211A, /* IEEE 802.11a */ 104 MODE_IEEE80211A, /* IEEE 802.11a */
106 MODE_IEEE80211B, /* IEEE 802.11b only */ 105 MODE_IEEE80211B, /* IEEE 802.11b only */
107 MODE_ATHEROS_TURBO, /* Atheros Turbo mode (2x.11a at 5 GHz) */
108 MODE_IEEE80211G, /* IEEE 802.11g (and 802.11b compatibility) */ 106 MODE_IEEE80211G, /* IEEE 802.11g (and 802.11b compatibility) */
109 MODE_ATHEROS_TURBOG, /* Atheros Turbo mode (2x.11g at 2.4 GHz) */
110 107
111 /* keep last */ 108 /* keep last */
112 NUM_IEEE80211_MODES 109 NUM_IEEE80211_MODES