summaryrefslogtreecommitdiff
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-03-28 10:58:37 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-04-10 14:54:08 -0400
commit64f68e5d15bee47e0d6d0c57a1cf52cedd9b3527 (patch)
treee000cea46fd57d876d725224d2b51b74cec35572 /net/mac80211/rx.c
parent24398e39c8ee4a9d9123eed322b859ece4d16cac (diff)
downloadlwn-64f68e5d15bee47e0d6d0c57a1cf52cedd9b3527.tar.gz
lwn-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/rx.c')
-rw-r--r--net/mac80211/rx.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 8da3b36c287a..54a049123a60 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2268,11 +2268,8 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
sband = rx->local->hw.wiphy->bands[status->band];
- rate_control_rate_update(
- local, sband, rx->sta,
- IEEE80211_RC_SMPS_CHANGED,
- ieee80211_get_tx_channel_type(
- local, local->_oper_channel_type));
+ rate_control_rate_update(local, sband, rx->sta,
+ IEEE80211_RC_SMPS_CHANGED);
goto handled;
}
default: