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:09:51 +0100 |
| commit | 9cdcdad4c2ff0ee42fe6004322f15745c3b749c8 (patch) | |
| tree | 2f91e98b5489b7dad8c8907f9ea299d925eba920 | |
| parent | 7309da08e3f43c781d0e08871431c51b104ff1b5 (diff) | |
| download | linux-stable-9cdcdad4c2ff0ee42fe6004322f15745c3b749c8.tar.gz linux-stable-9cdcdad4c2ff0ee42fe6004322f15745c3b749c8.tar.bz2 linux-stable-9cdcdad4c2ff0ee42fe6004322f15745c3b749c8.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>
| -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 51f31e77c19b..ed4fef32b394 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1886,7 +1886,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", |