Commit abd76d25 authored Aug 31, 2018 by Dreyfuss, Haim Committed by Johannes Berg Sep 03, 2018

mac80211: fix WMM TXOP calculation



In commit 9236c4523e5b ("mac80211: limit wmm params to comply
with ETSI requirements"), we have limited the WMM parameters to
comply with 802.11 and ETSI standard.  Mistakenly the TXOP value
was caluclated wrong.  Fix it by taking the minimum between
802.11 to ETSI to make sure we are not violating both.

Fixes: e552af05 ("mac80211: limit wmm params to comply with ETSI requirements")
Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 8442938c

net/mac80211/util.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1151,8 +1151,7 @@ void ieee80211_regulatory_limit_wmm_params(struct ieee80211_sub_if_data *sdata,
		qparam->cw_min = max_t(u16, qparam->cw_min, wmm_ac->cw_min);
		qparam->cw_max = max_t(u16, qparam->cw_max, wmm_ac->cw_max);
		qparam->aifs = max_t(u8, qparam->aifs, wmm_ac->aifsn);
		qparam->txop = !qparam->txop ? wmm_ac->cot / 32 :
		min_t(u16, qparam->txop, wmm_ac->cot / 32);
		qparam->txop = min_t(u16, qparam->txop, wmm_ac->cot / 32);
		rcu_read_unlock();
		}

Admin message