hostapd: fix dynamically adding interfaces with 802.11ax support disabled in the...
authorFelix Fietkau <nbd@nbd.name>
Mon, 18 Sep 2023 14:50:35 +0000 (16:50 +0200)
committerFelix Fietkau <nbd@nbd.name>
Mon, 18 Sep 2023 14:51:34 +0000 (16:51 +0200)
Move an important code line outside of #ifdef CONFIG_IEEE80211AX

Signed-off-by: Felix Fietkau <nbd@nbd.name>
package/network/services/hostapd/patches/182-nl80211-move-nl80211_put_freq_params-call-outside-of.patch [new file with mode: 0644]

diff --git a/package/network/services/hostapd/patches/182-nl80211-move-nl80211_put_freq_params-call-outside-of.patch b/package/network/services/hostapd/patches/182-nl80211-move-nl80211_put_freq_params-call-outside-of.patch
new file mode 100644 (file)
index 0000000..395c645
--- /dev/null
@@ -0,0 +1,34 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Mon, 18 Sep 2023 16:47:41 +0200
+Subject: [PATCH] nl80211: move nl80211_put_freq_params call outside of
+ 802.11ax #ifdef
+
+The relevance of this call is not specific to 802.11ax, so it should be done
+even with CONFIG_IEEE80211AX disabled.
+
+Fixes: b3921db426ea ("nl80211: Add frequency info in start AP command")
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -5226,6 +5226,9 @@ static int wpa_driver_nl80211_set_ap(voi
+               nla_nest_end(msg, ftm);
+       }
++      if (params->freq && nl80211_put_freq_params(msg, params->freq) < 0)
++              goto fail;
++
+ #ifdef CONFIG_IEEE80211AX
+       if (params->he_spr_ctrl) {
+               struct nlattr *spr;
+@@ -5260,9 +5263,6 @@ static int wpa_driver_nl80211_set_ap(voi
+               nla_nest_end(msg, spr);
+       }
+-      if (params->freq && nl80211_put_freq_params(msg, params->freq) < 0)
+-              goto fail;
+-
+       if (params->freq && params->freq->he_enabled) {
+               struct nlattr *bss_color;