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 16:49:27 -0700 |
| commit | b708e610622cff07f4374a2b4410884f964b8489 (patch) | |
| tree | 77aee49d680178df819437a35ba23cce9ad14e18 /net/mac80211/util.c | |
| parent | d4e46a3d9869563c6210b01bb651c40cbe65da80 (diff) | |
| download | kernel_samsung_aries-b708e610622cff07f4374a2b4410884f964b8489.zip kernel_samsung_aries-b708e610622cff07f4374a2b4410884f964b8489.tar.gz kernel_samsung_aries-b708e610622cff07f4374a2b4410884f964b8489.tar.bz2 | |
[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/util.c')
| -rw-r--r-- | net/mac80211/util.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index c970996..29c0a0e 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -93,11 +93,6 @@ void ieee80211_prepare_rates(struct ieee80211_local *local, if (rate->rate == 10 || rate->rate == 20) rate->flags |= IEEE80211_RATE_BASIC; break; - case MODE_ATHEROS_TURBO: - if (rate->rate == 120 || rate->rate == 240 || - rate->rate == 480) - rate->flags |= IEEE80211_RATE_BASIC; - break; case MODE_IEEE80211G: if (rate->rate == 10 || rate->rate == 20 || rate->rate == 55 || rate->rate == 110) @@ -116,8 +111,6 @@ void ieee80211_prepare_rates(struct ieee80211_local *local, if (rate->rate == 10) rate->flags |= IEEE80211_RATE_MANDATORY; break; - case MODE_ATHEROS_TURBO: - break; case MODE_IEEE80211G: if (rate->rate == 10 || rate->rate == 20 || rate->rate == 55 || rate->rate == 110 || @@ -273,8 +266,7 @@ int ieee80211_frame_duration(struct ieee80211_local *local, size_t len, * DIV_ROUND_UP() operations. */ - if (local->hw.conf.phymode == MODE_IEEE80211A || erp || - local->hw.conf.phymode == MODE_ATHEROS_TURBO) { + if (local->hw.conf.phymode == MODE_IEEE80211A || erp) { /* * OFDM: * @@ -288,7 +280,6 @@ int ieee80211_frame_duration(struct ieee80211_local *local, size_t len, * 802.11g - 19.8.4: aSIFSTime = 10 usec + * signal ext = 6 usec */ - /* FIX: Atheros Turbo may have different (shorter) duration? */ dur = 16; /* SIFS + signal ext */ dur += 16; /* 17.3.2.3: T_PREAMBLE = 16 usec */ dur += 4; /* 17.3.2.3: T_SIGNAL = 4 usec */ |