diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-03-28 10:58:37 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-10 14:54:08 -0400 |
| commit | 64f68e5d15bee47e0d6d0c57a1cf52cedd9b3527 (patch) | |
| tree | e000cea46fd57d876d725224d2b51b74cec35572 /net/mac80211/chan.c | |
| parent | 24398e39c8ee4a9d9123eed322b859ece4d16cac (diff) | |
| download | linux-64f68e5d15bee47e0d6d0c57a1cf52cedd9b3527.tar.gz linux-64f68e5d15bee47e0d6d0c57a1cf52cedd9b3527.tar.bz2 linux-64f68e5d15bee47e0d6d0c57a1cf52cedd9b3527.zip | |
mac80211: remove channel type argument from rate_update
The channel type argument to the rate_update()
callback isn't really the correct way to give
the rate control algorithm about the desired
RX bandwidth of the peer.
Remove this argument, and instead update the
STA capabilities with 20/40 appropriately. The
SMPS update done by this callback works in the
same way, so this makes the callback cleaner.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/chan.c')
| -rw-r--r-- | net/mac80211/chan.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index e00ce8c3e28e..c76cf7230c7d 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -135,29 +135,3 @@ bool ieee80211_set_channel_type(struct ieee80211_local *local, return result; } - -/* - * ieee80211_get_tx_channel_type returns the channel type we should - * use for packet transmission, given the channel capability and - * whatever regulatory flags we have been given. - */ -enum nl80211_channel_type ieee80211_get_tx_channel_type( - struct ieee80211_local *local, - enum nl80211_channel_type channel_type) -{ - switch (channel_type) { - case NL80211_CHAN_HT40PLUS: - if (local->hw.conf.channel->flags & - IEEE80211_CHAN_NO_HT40PLUS) - return NL80211_CHAN_HT20; - break; - case NL80211_CHAN_HT40MINUS: - if (local->hw.conf.channel->flags & - IEEE80211_CHAN_NO_HT40MINUS) - return NL80211_CHAN_HT20; - break; - default: - break; - } - return channel_type; -} |