Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 911a2648 authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

mac80211: Fix condition validating WMM IE 



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>
parent 64e86fec

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -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",