git.openwrt.org Git - openwrt/staging/ldir.git/blob

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Date: Mon, 18 Sep 2023 16:47:41 +0200
   3 Subject: [PATCH] nl80211: move nl80211_put_freq_params call outside of
   4  802.11ax #ifdef
   5
   6 The relevance of this call is not specific to 802.11ax, so it should be done
   7 even with CONFIG_IEEE80211AX disabled.
   8
   9 Fixes: b3921db426ea ("nl80211: Add frequency info in start AP command")
  10 Signed-off-by: Felix Fietkau <nbd@nbd.name>
  11 ---
  12
  13 --- a/src/drivers/driver_nl80211.c
  14 +++ b/src/drivers/driver_nl80211.c
  15 @@ -5226,6 +5226,9 @@ static int wpa_driver_nl80211_set_ap(voi
  16                 nla_nest_end(msg, ftm);
  17         }
  18
  19 +       if (params->freq && nl80211_put_freq_params(msg, params->freq) < 0)
  20 +               goto fail;
  21 +
  22  #ifdef CONFIG_IEEE80211AX
  23         if (params->he_spr_ctrl) {
  24                 struct nlattr *spr;
  25 @@ -5260,9 +5263,6 @@ static int wpa_driver_nl80211_set_ap(voi
  26                 nla_nest_end(msg, spr);
  27         }
  28
  29 -       if (params->freq && nl80211_put_freq_params(msg, params->freq) < 0)
  30 -               goto fail;
  31 -
  32         if (params->freq && params->freq->he_enabled) {
  33                 struct nlattr *bss_color;
  34