diff options
| author |   Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2018-03-26 16:21:04 +0300 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2018-03-29 15:02:38 +0200 |
| commit | c470bdc1aaf36669e04ba65faf1092b2d1c6cabe (patch) | |
| tree | 47afa9fa871ce11a8cab8d676ff36a2a5e318dc8 /net/mac80211 | |
| parent | Merge branch 'eapol-over-nl80211' into mac80211-next (diff) | |
| download | linux-dev-c470bdc1aaf36669e04ba65faf1092b2d1c6cabe.tar.xz linux-dev-c470bdc1aaf36669e04ba65faf1092b2d1c6cabe.zip | |
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: f409079bb678 ("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>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 20d2b186d740..07b58d20e89c 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -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); |