Commit f4cfdd46 authored Jul 17, 2019 by Brian Norris Committed by Greg Kroah-Hartman Aug 16, 2019

mac80211: don't warn about CW params when not using them



[ Upstream commit d2b3fe42bc629c2d4002f652b3abdfb2e72991c7 ]

ieee80211_set_wmm_default() normally sets up the initial CW min/max for
each queue, except that it skips doing this if the driver doesn't
support ->conf_tx. We still end up calling drv_conf_tx() in some cases
(e.g., ieee80211_reconfig()), which also still won't do anything
useful...except it complains here about the invalid CW parameters.

Let's just skip the WARN if we weren't going to do anything useful with
the parameters.

Signed-off-by: Brian Norris <briannorris@chromium.org>
Link: https://lore.kernel.org/r/20190718015712.197499-1-briannorris@chromium.org


Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent f2fd8981

net/mac80211/driver-ops.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -169,11 +169,16 @@ int drv_conf_tx(struct ieee80211_local *local,
		if (!check_sdata_in_driver(sdata))
		return -EIO;

		if (WARN_ONCE(params->cw_min == 0 \|\|
		params->cw_min > params->cw_max,
		if (params->cw_min == 0 \|\| params->cw_min > params->cw_max) {
		/*
		* If we can't configure hardware anyway, don't warn. We may
		* never have initialized the CW parameters.
		*/
		WARN_ONCE(local->ops->conf_tx,
		"%s: invalid CW_min/CW_max: %d/%d\n",
		sdata->name, params->cw_min, params->cw_max))
		sdata->name, params->cw_min, params->cw_max);
		return -EINVAL;
		}

		trace_drv_conf_tx(local, sdata, ac, params);
		if (local->ops->conf_tx)