Commit c470bdc1 authored Mar 26, 2018 by Emmanuel Grumbach Committed by Johannes Berg Mar 29, 2018

mac80211: don't WARN on bad WMM parameters from buggy APs

Apparently, some APs are buggy enough to send a zeroed
WMM IE. Don't WARN on this since this is not caused by a bug
on the client's system.

This aligns the condition of the WARNING in drv_conf_tx
with the validity check in ieee80211_sta_wmm_params.
We will now pick the default values whenever we get
a zeroed WMM IE.

This has been reported here:
https://bugzilla.kernel.org/show_bug.cgi?id=199161



Fixes: f409079b ("mac80211: sanity check CW_min/CW_max towards driver")
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 1dd2eefb

net/mac80211/mlme.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1786,7 +1786,8 @@ static bool ieee80211_sta_wmm_params(struct ieee80211_local *local,
		params[ac].acm = acm;
		params[ac].uapsd = uapsd;

		if (params[ac].cw_min > params[ac].cw_max) {
		if (params->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",
		params[ac].cw_min, params[ac].cw_max, aci);

Admin message