Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bda3ff1 authored by Alexis Lothoré's avatar Alexis Lothoré Committed by Sasha Levin
Browse files

wifi: wilc1000: fix declarations ordering 



[ Upstream commit 535733e90e5d8912ebeccebb05b354a2d06ff459 ]

Reorder parameters declaration in wilc_parse_join_bss_param to enforce
reverse christmas tree

Signed-off-by: default avatarAlexis Lothoré <alexis.lothore@bootlin.com>
Signed-off-by: default avatarKalle 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: default avatarSasha Levin <sashal@kernel.org>
parent 8c6210d1

drivers/staging/wilc1000/wilc_hif.c

+4 −4
Original line number Diff line number Diff line
@@ -441,13 +441,13 @@ static void handle_connect_timeout(struct work_struct *work) 
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)