]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: wilc1000: fix declarations ordering
authorAlexis Lothoré <alexis.lothore@bootlin.com>
Fri, 5 Jan 2024 07:57:32 +0000 (08:57 +0100)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:21:49 +0000 (18:21 -0400)
[ Upstream commit 535733e90e5d8912ebeccebb05b354a2d06ff459 ]

Reorder parameters declaration in wilc_parse_join_bss_param to enforce
reverse christmas tree

Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240105075733.36331-2-alexis.lothore@bootlin.com
Stable-dep-of: 205c50306acf ("wifi: wilc1000: fix RCU usage in connect path")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/microchip/wilc1000/hif.c

index 884f45e627a72ff40a7c4b764b47472a0426f5ef..bff33f39605b9abebee7d7fc0c908bc7509528f5 100644 (file)
@@ -359,13 +359,13 @@ out:
 void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
                                struct cfg80211_crypto_settings *crypto)
 {
-       struct wilc_join_bss_param *param;
-       struct ieee80211_p2p_noa_attr noa_attr;
-       u8 rates_len = 0;
+       const struct cfg80211_bss_ies *ies = rcu_dereference(bss->ies);
        const u8 *tim_elm, *ssid_elm, *rates_ie, *supp_rates_ie;
        const u8 *ht_ie, *wpa_ie, *wmm_ie, *rsn_ie;
+       struct ieee80211_p2p_noa_attr noa_attr;
+       struct wilc_join_bss_param *param;
+       u8 rates_len = 0;
        int ret;
-       const struct cfg80211_bss_ies *ies = rcu_dereference(bss->ies);
 
        param = kzalloc(sizeof(*param), GFP_KERNEL);
        if (!param)