47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From 2e1c4caa71155fdf53ed8acb18d5b3e3cfd69660 Mon Sep 17 00:00:00 2001
|
|
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>
|
|
|
|
---
|
|
src/drivers/driver_nl80211_capa.c | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
|
|
index 8318b10ab..0d35b13b5 100644
|
|
--- 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_hw_modes *mode,
|
|
[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_hw_modes *mode,
|
|
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 =
|