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/regdomain.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/regdomain.c')
-rw-r--r-- | net/mac80211/regdomain.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/mac80211/regdomain.c b/net/mac80211/regdomain.c index b697a2afbb4b..f42678fa62d1 100644 --- a/net/mac80211/regdomain.c +++ b/net/mac80211/regdomain.c | |||
@@ -82,12 +82,6 @@ static void ieee80211_unmask_channel(int mode, struct ieee80211_channel *chan) | |||
82 | 82 | ||
83 | chan->flag = 0; | 83 | chan->flag = 0; |
84 | 84 | ||
85 | if (ieee80211_regdom == 64 && | ||
86 | (mode == MODE_ATHEROS_TURBO || mode == MODE_ATHEROS_TURBOG)) { | ||
87 | /* Do not allow Turbo modes in Japan. */ | ||
88 | return; | ||
89 | } | ||
90 | |||
91 | for (i = 0; channel_range[i].start_freq; i++) { | 85 | for (i = 0; channel_range[i].start_freq; i++) { |
92 | const struct ieee80211_channel_range *r = &channel_range[i]; | 86 | const struct ieee80211_channel_range *r = &channel_range[i]; |
93 | if (r->start_freq <= chan->freq && r->end_freq >= chan->freq) { | 87 | if (r->start_freq <= chan->freq && r->end_freq >= chan->freq) { |