diff options
author | Felix Fietkau <nbd@nbd.name> | 2020-01-23 14:51:58 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2020-01-23 14:53:13 +0100 |
commit | c07f6e8659ea1348c75c04dac2924616f0042293 (patch) | |
tree | d7ed15e80a5443be69ac21dfc0bddc4a2ac28033 /package/network/services/hostapd/patches/070-driver_nl80211-fix-WMM-queue-mapping-for-regulatory-.patch | |
parent | 6fe31abc5a466f533547d91aed6b747cd3c44efe (diff) | |
download | upstream-c07f6e8659ea1348c75c04dac2924616f0042293.tar.gz upstream-c07f6e8659ea1348c75c04dac2924616f0042293.tar.bz2 upstream-c07f6e8659ea1348c75c04dac2924616f0042293.zip |
hostapd: fix faulty WMM IE parameters with ETSI regulatory domains
hostapd sets minimum values for CWmin/CWmax/AIFS and maximum for TXOP.
The code for applying those values had a few bugs leading to bogus values,
which caused significant latency and packet loss.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/network/services/hostapd/patches/070-driver_nl80211-fix-WMM-queue-mapping-for-regulatory-.patch')
-rw-r--r-- | package/network/services/hostapd/patches/070-driver_nl80211-fix-WMM-queue-mapping-for-regulatory-.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/package/network/services/hostapd/patches/070-driver_nl80211-fix-WMM-queue-mapping-for-regulatory-.patch b/package/network/services/hostapd/patches/070-driver_nl80211-fix-WMM-queue-mapping-for-regulatory-.patch new file mode 100644 index 0000000000..240411236a --- /dev/null +++ b/package/network/services/hostapd/patches/070-driver_nl80211-fix-WMM-queue-mapping-for-regulatory-.patch @@ -0,0 +1,41 @@ +From: Felix Fietkau <nbd@nbd.name> +Date: Thu, 23 Jan 2020 13:50:47 +0100 +Subject: [PATCH] driver_nl80211: fix WMM queue mapping for regulatory + limit + +nl80211 uses a different queue mapping from hostap, so AC indexes need to +be converted. + +Signed-off-by: Felix Fietkau <nbd@nbd.name> +--- + +--- a/src/drivers/driver_nl80211_capa.c ++++ b/src/drivers/driver_nl80211_capa.c +@@ -1403,6 +1403,12 @@ static void phy_info_freq(struct hostapd + [NL80211_WMMR_AIFSN] = { .type = NLA_U8 }, + [NL80211_WMMR_TXOP] = { .type = NLA_U16 }, + }; ++ static const u8 wmm_map[4] = { ++ [NL80211_AC_BE] = WMM_AC_BE, ++ [NL80211_AC_BK] = WMM_AC_BK, ++ [NL80211_AC_VI] = WMM_AC_VI, ++ [NL80211_AC_VO] = WMM_AC_VO, ++ }; + struct nlattr *nl_wmm; + struct nlattr *tb_wmm[NL80211_WMMR_MAX + 1]; + int rem_wmm, ac, count = 0; +@@ -1424,12 +1430,13 @@ static void phy_info_freq(struct hostapd + return; + } + ac = nl_wmm->nla_type; +- if (ac < 0 || ac >= WMM_AC_NUM) { ++ if (ac >= ARRAY_SIZE(wmm_map)) { + wpa_printf(MSG_DEBUG, + "nl80211: Invalid AC value %d", ac); + return; + } + ++ ac = wmm_map[ac]; + chan->wmm_rules[ac].min_cwmin = + nla_get_u16(tb_wmm[NL80211_WMMR_CW_MIN]); + chan->wmm_rules[ac].min_cwmax = |