OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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>
This commit is contained in:
Brian Norris 2019-07-17 18:57:12 -07:00 committed by Johannes Berg
parent bcc27fab8c
commit d2b3fe42bc
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/mac80211/driver-ops.c
View File

@ -187,11 +187,16 @@ int drv_conf_tx(struct ieee80211_local *local,
if (!check_sdata_in_driver(sdata)) if (!check_sdata_in_driver(sdata))
return -EIO; return -EIO;
if (WARN_ONCE(params->cw_min == 0 || if (params->cw_min == 0 || params->cw_min > params->cw_max) {
params->cw_min > params->cw_max, /*
"%s: invalid CW_min/CW_max: %d/%d\n", * If we can't configure hardware anyway, don't warn. We may
sdata->name, params->cw_min, params->cw_max)) * 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);
return -EINVAL; return -EINVAL;
}
trace_drv_conf_tx(local, sdata, ac, params); trace_drv_conf_tx(local, sdata, ac, params);
if (local->ops->conf_tx) if (local->ops->conf_tx)