diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-09-14 11:10:25 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:49:27 -0400 |
commit | b708e610622cff07f4374a2b4410884f964b8489 (patch) | |
tree | 77aee49d680178df819437a35ba23cce9ad14e18 /net/mac80211/ieee80211.c | |
parent | d4e46a3d9869563c6210b01bb651c40cbe65da80 (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 'net/mac80211/ieee80211.c')
-rw-r--r-- | net/mac80211/ieee80211.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 506cfa06b184..0e8a70f408e2 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c | |||
@@ -118,10 +118,6 @@ ieee80211_fill_frame_info(struct ieee80211_local *local, | |||
118 | case MODE_IEEE80211G: | 118 | case MODE_IEEE80211G: |
119 | fi->phytype = htonl(ieee80211_phytype_pbcc_dot11_g); | 119 | fi->phytype = htonl(ieee80211_phytype_pbcc_dot11_g); |
120 | break; | 120 | break; |
121 | case MODE_ATHEROS_TURBO: | ||
122 | fi->phytype = | ||
123 | htonl(ieee80211_phytype_dsss_dot11_turbo); | ||
124 | break; | ||
125 | default: | 121 | default: |
126 | fi->phytype = htonl(0xAAAAAAAA); | 122 | fi->phytype = htonl(0xAAAAAAAA); |
127 | break; | 123 | break; |
@@ -1225,7 +1221,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, | |||
1225 | local->long_retry_limit = 4; | 1221 | local->long_retry_limit = 4; |
1226 | local->hw.conf.radio_enabled = 1; | 1222 | local->hw.conf.radio_enabled = 1; |
1227 | 1223 | ||
1228 | local->enabled_modes = (unsigned int) -1; | 1224 | local->enabled_modes = ~0; |
1229 | 1225 | ||
1230 | INIT_LIST_HEAD(&local->modes_list); | 1226 | INIT_LIST_HEAD(&local->modes_list); |
1231 | 1227 | ||