diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-10-27 18:38:15 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-10-27 18:38:15 +0100 |
| commit | 99c814066e75d09e6a38574c6c395f022a04b730 (patch) | |
| tree | f56d74a72e0c0d738c0096e4dfe310d27c42c39b /net/mac80211/rate.c | |
| parent | Merge tag 'iwlwifi-for-john-2014-10-23' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | mac80211: minstrels: fix buffer overflow in HT debugfs rc_stats (diff) | |
| download | linux-99c814066e75d09e6a38574c6c395f022a04b730.tar.xz linux-99c814066e75d09e6a38574c6c395f022a04b730.zip | |
Merge tag 'mac80211-for-john-2014-10-23' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg <johannes@sipsolutions.net> says:
"Here are a few fixes for the wireless stack: one fixes the
RTS rate, one for a debugfs file, one to return the correct
channel to userspace, a sanity check for a userspace value
and the remaining two are just documentation fixes."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rate.c')
| -rw-r--r-- | net/mac80211/rate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index 8fdadfd94ba8..6081329784dd 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -448,7 +448,7 @@ static void rate_fixup_ratelist(struct ieee80211_vif *vif, */ if (!(rates[0].flags & IEEE80211_TX_RC_MCS)) { u32 basic_rates = vif->bss_conf.basic_rates; - s8 baserate = basic_rates ? ffs(basic_rates - 1) : 0; + s8 baserate = basic_rates ? ffs(basic_rates) - 1 : 0; rate = &sband->bitrates[rates[0].idx]; |