| Message ID | TYAP286MB03157A408E0D69F2F6FBD88ABC552@TYAP286MB0315.JPNP286.PROD.OUTLOOK.COM |
|---|---|
| State | New |
| Headers | show |
| Series | wifi: rtl8xxxu: fix mixed declarations in rtl8xxxu_set_aifs() | expand |
> -----Original Message----- > From: Shiji Yang <yangshiji66@outlook.com> > Sent: Friday, February 23, 2024 9:35 PM > To: linux-wireless@vger.kernel.org > Cc: Jes Sorensen <Jes.Sorensen@gmail.com>; Kalle Valo <kvalo@kernel.org>; linux-kernel@vger.kernel.org; > Shiji Yang <yangshiji66@outlook.com> > Subject: [PATCH] wifi: rtl8xxxu: fix mixed declarations in rtl8xxxu_set_aifs() > > Moving struct ieee80211_sta *sta variable definition to the front > of the code to fix the ISO C90 forbids mixed declarations and code > warning. I suppose there will be no this kind of warnings after the commit b5ec6fd286df ("kbuild: Drop -Wdeclaration-after-statement") since v6.5. But as commit message mentioned -- " It will still be recommeneded to place declarations at the start of a scope where possible, but it will no longer be enforced." Then, this patch looks good to me. > > Fixes: 43532c050f8e ("wifi: rtl8xxxu: support multiple interfaces in set_aifs()") > Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
Shiji Yang <yangshiji66@outlook.com> wrote: > Moving struct ieee80211_sta *sta variable definition to the front > of the code to fix the ISO C90 forbids mixed declarations and code > warning. > > Fixes: 43532c050f8e ("wifi: rtl8xxxu: support multiple interfaces in set_aifs()") > Signed-off-by: Shiji Yang <yangshiji66@outlook.com> > Reviewed-by: Ping-Ke Shih <pkshih@realtek.com> Patch applied to wireless-next.git, thanks. a7e178259c5b wifi: rtl8xxxu: fix mixed declarations in rtl8xxxu_set_aifs()
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c index 6dfa060..6c03433 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -4919,11 +4919,11 @@ static void rtl8xxxu_set_aifs(struct rtl8xxxu_priv *priv, u8 slot_time) int i; for (i = 0; i < ARRAY_SIZE(priv->vifs); i++) { + struct ieee80211_sta *sta; + if (!priv->vifs[i]) continue; - struct ieee80211_sta *sta; - rcu_read_lock(); sta = ieee80211_find_sta(priv->vifs[i], priv->vifs[i]->bss_conf.bssid); if (sta)
Moving struct ieee80211_sta *sta variable definition to the front of the code to fix the ISO C90 forbids mixed declarations and code warning. Fixes: 43532c050f8e ("wifi: rtl8xxxu: support multiple interfaces in set_aifs()") Signed-off-by: Shiji Yang <yangshiji66@outlook.com> --- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)