diff options
| author | Ilan Peer <ilan.peer@intel.com> | 2018-04-03 11:35:22 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-21 14:13:10 +0100 |
| commit | 8f8a5a9be2b422af6a7ea12a8fe2bdefdab754c5 (patch) | |
| tree | 711c7b2a25563092d56a4bed4be3df79feb0f850 /net/mac80211 | |
| parent | 603bd4dc73594c8ac39a578d9fae997ea04e3a17 (diff) | |
| download | linux-exynos-8f8a5a9be2b422af6a7ea12a8fe2bdefdab754c5.tar.gz linux-exynos-8f8a5a9be2b422af6a7ea12a8fe2bdefdab754c5.tar.bz2 linux-exynos-8f8a5a9be2b422af6a7ea12a8fe2bdefdab754c5.zip | |
mac80211: Fix condition validating WMM IE
[ Upstream commit 911a26484c33e10de6237228ca1d7293548e9f49 ]
Commit c470bdc1aaf3 ("mac80211: don't WARN on bad WMM parameters from
buggy APs") handled cases where an AP reports a zeroed WMM
IE. However, the condition that checks the validity accessed the wrong
index in the ieee80211_tx_queue_params array, thus wrongly deducing
that the parameters are invalid. Fix it.
Fixes: c470bdc1aaf3 ("mac80211: don't WARN on bad WMM parameters from buggy APs")
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 75909a744121..4c59b5507e7a 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1861,7 +1861,7 @@ static bool ieee80211_sta_wmm_params(struct ieee80211_local *local, params[ac].acm = acm; params[ac].uapsd = uapsd; - if (params->cw_min == 0 || + if (params[ac].cw_min == 0 || params[ac].cw_min > params[ac].cw_max) { sdata_info(sdata, "AP has invalid WMM params (CWmin/max=%d/%d for ACI %d), using defaults\n", |