diff mbox series

[v2,1/2] wifi: wilc1000: fix declarations ordering

Message ID 20240105075733.36331-2-alexis.lothore@bootlin.com (mailing list archive)
State Accepted
Commit 535733e90e5d8912ebeccebb05b354a2d06ff459
Delegated to: Kalle Valo
Headers show
Series wifi: wilc1000: fix RCU warning in connect path | expand

Commit Message

Alexis Lothoré Jan. 5, 2024, 7:57 a.m. UTC 
From: Alexis Lothoré <alexis.lothore@bootlin.com>

Reorder parameters declaration in wilc_parse_join_bss_param to enforce
reverse christmas tree

Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
---
 drivers/net/wireless/microchip/wilc1000/hif.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Kalle Valo Jan. 12, 2024, 5:10 p.m. UTC | #1 
Alexis Lothoré <alexis.lothore@bootlin.com> wrote:

> From: Alexis Lothoré <alexis.lothore@bootlin.com>
> 
> Reorder parameters declaration in wilc_parse_join_bss_param to enforce
> reverse christmas tree
> 
> Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>

2 patches applied to wireless-next.git, thanks.

535733e90e5d wifi: wilc1000: fix declarations ordering
205c50306acf wifi: wilc1000: fix RCU usage in connect path
diff mbox series

Patch

diff --git a/drivers/net/wireless/microchip/wilc1000/hif.c b/drivers/net/wireless/microchip/wilc1000/hif.c
index 839f142663e8..6f1218a51061 100644
--- a/drivers/net/wireless/microchip/wilc1000/hif.c
+++ b/drivers/net/wireless/microchip/wilc1000/hif.c
@@ -377,13 +377,13 @@  struct wilc_join_bss_param *
 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)