wifi: brcmfmac: do not pass hidden SSID attribute as value directly

In brcmf_cfg80211_start_ap() do not assume that NL80211_HIDDEN_SSID_NOT_IN_USE
is zero but prefer an explicit check instead. Use local variable 'closednet'
to pass in function call and use for error message.

Compile tested only. Addition for the commit f20073f50dfd1 ("wifi: brcmfmac: do
not cast hidden SSID attribute value to boolean").

Signed-off-by: Alexey Berezhok <a@bayrepo.ru>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240222122923.46691-1-a@bayrepo.ru

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index adf8a14feb49f15a4969e5f4d4c87d30e541b170..54ff59a8c35cad73181b254a167928ae8ff13fe4 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -5101,6 +5101,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
        bool mbss;
        int is_11d;
        bool supports_11d;
+       bool closednet;
 
        brcmf_dbg(TRACE, "ctrlchn=%d, center=%d, bw=%d, beacon_interval=%d, dtim_period=%d,\n",
                  settings->chandef.chan->hw_value,
@@ -5270,12 +5271,12 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
                        goto exit;
                }
 
-               err = brcmf_fil_iovar_int_set(ifp, "closednet",
-                                             settings->hidden_ssid);
+               closednet =
+                       (settings->hidden_ssid != NL80211_HIDDEN_SSID_NOT_IN_USE);
+               err = brcmf_fil_iovar_int_set(ifp, "closednet", closednet);
                if (err) {
                        bphy_err(drvr, "%s closednet error (%d)\n",
-                                (settings->hidden_ssid != NL80211_HIDDEN_SSID_NOT_IN_USE) ?
-                                "enabled" : "disabled",
+                                (closednet ? "enabled" : "disabled"),
                                 err);
                        goto exit;
                }