Commit 183ed5c6 authored by Ilan Peer's avatar Ilan Peer Committed by Juerg Haefliger

mac80211: Fix condition validating WMM IE

BugLink: https://bugs.launchpad.net/bugs/1811252

[ Upstream commit 911a2648 ]

Commit c470bdc1 ("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: c470bdc1 ("mac80211: don't WARN on bad WMM parameters from buggy APs")
Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarJuerg Haefliger <juergh@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent eedbd816
...@@ -1886,7 +1886,7 @@ static bool ieee80211_sta_wmm_params(struct ieee80211_local *local, ...@@ -1886,7 +1886,7 @@ static bool ieee80211_sta_wmm_params(struct ieee80211_local *local,
params[ac].acm = acm; params[ac].acm = acm;
params[ac].uapsd = uapsd; params[ac].uapsd = uapsd;
if (params->cw_min == 0 || if (params[ac].cw_min == 0 ||
params[ac].cw_min > params[ac].cw_max) { params[ac].cw_min > params[ac].cw_max) {
sdata_info(sdata, sdata_info(sdata,
"AP has invalid WMM params (CWmin/max=%d/%d for ACI %d), using defaults\n", "AP has invalid WMM params (CWmin/max=%d/%d for ACI %d), using defaults\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment