diff options
| author |   Ilan Peer <ilan.peer@intel.com> | 2018-04-03 11:35:22 +0300 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2018-04-19 15:46:22 +0200 |
| commit | 911a26484c33e10de6237228ca1d7293548e9f49 (patch) | |
| tree | a12038efbdea9fe71d00d4a08228f25fdbeb14c1 /net/mac80211 | |
| parent | net: qualcomm: rmnet: Fix warning seen with fill_info (diff) | |
| download | linux-dev-911a26484c33e10de6237228ca1d7293548e9f49.tar.xz linux-dev-911a26484c33e10de6237228ca1d7293548e9f49.zip | |
mac80211: Fix condition validating WMM IE
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>
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 69449db7e283..6fe72ef182a1 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1787,7 +1787,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", |