summaryrefslogtreecommitdiffstats
path: root/net/mac80211/rate.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-06-19 18:55:06 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-06-19 18:55:12 +0200
commitf93beba705842af466e7c916b39630cacb40e9c6 (patch)
tree0f296f0b1e419eb4fc242e188376a4fdd80085fa /net/mac80211/rate.c
parent52874a5e3917dde3b081521b014d6e4b226aacff (diff)
parent3a5a423bb958ad22eeccca66c533e85bf69ba10e (diff)
downloadlinux-f93beba705842af466e7c916b39630cacb40e9c6.tar.bz2
Merge remote-tracking branch 'mac80211/master' into HEAD
Merge mac80211 to avoid conflicts with the nl80211 attrbuf changes. Conflicts: net/mac80211/iface.c net/wireless/nl80211.c Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rate.c')
-rw-r--r--net/mac80211/rate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index dbbcd57b0fc6..30d58d2d13e2 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -621,7 +621,7 @@ static void rate_control_apply_mask(struct ieee80211_sub_if_data *sdata,
if (rates[i].idx < 0)
break;
- rate_idx_match_mask(&rates[i], sband, mask, chan_width,
+ rate_idx_match_mask(&rates[i], sband, chan_width, mask,
mcs_mask);
}
}