rtlwifi: replace usage of found with dedicated list iterator variable
PATCH 1/1 rtlwifi: replace usage of found with dedicated list iterator variable
To move the list iterator variable into the list_for_each_entry_*() macro in the future it should be avoided to use the list iterator variable after the loop body.
To *never* use the list iterator variable after the loop it was concluded to use a separate iterator variable instead of a found boolean [1].
This removes the need to use a found variable and simply checking if the variable was set, can determine if the break/goto was hit.
--- drivers/net/wireless/realtek/rtlwifi/base.c | 13 ++++++------- drivers/net/wireless/realtek/rtlwifi/pci.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 15 deletions(-)
drivers/net/wireless/realtek/rtlwifi/base.c +6 -7
@@ -1994,8 +1994,7 @@ void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb)struct rtl_mac *mac =rtl_mac (rtl_priv (hw));unsigned long flags; -struct rtl_bssid_entry *entry; -bool entry_found = false; +struct rtl_bssid_entry *entry =NULL , *iter;/* check if it is scanning */ if (!mac->act_scanning)
@@ -2008,10 +2007,10 @@ void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb)spin_lock_irqsave (&rtlpriv->locks.scan_list_lock, flags); -list_for_each_entry (entry, &rtlpriv->scan_list.list, list) { -if (memcmp (entry->bssid, hdr->addr3,ETH_ALEN ) ==0 ) { -list_del_init (&entry->list); - entry_found = true; +list_for_each_entry (iter, &rtlpriv->scan_list.list, list) { +if (memcmp (iter->bssid, hdr->addr3,ETH_ALEN ) ==0 ) { +list_del_init (&iter->list); + entry = iter;rtl_dbg (rtlpriv,COMP_SCAN ,DBG_LOUD ,"Update BSSID=%pM to scan list (total=%d)\n" , hdr->addr3, rtlpriv->scan_list.num);
@@ -2019,7 +2018,7 @@ void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb) } } -if (!entry_found) { +if (!entry) { entry =kmalloc (sizeof (*entry),GFP_ATOMIC );if (!entry)
drivers/net/wireless/realtek/rtlwifi/pci.c +7 -8
@@ -323,14 +323,13 @@ static bool rtl_pci_check_buddy_priv(struct ieee80211_hw *hw, {struct rtl_priv *rtlpriv =rtl_priv (hw);struct rtl_pci_priv *pcipriv =rtl_pcipriv (hw); -bool find_buddy_priv = false; -struct rtl_priv *tpriv; +struct rtl_priv *tpriv =NULL , *iter;struct rtl_pci_priv *tpcipriv =NULL ;if (!list_empty (&rtlpriv->glb_var->glb_priv_list)) { -list_for_each_entry (tpriv, &rtlpriv->glb_var->glb_priv_list, +list_for_each_entry (iter, &rtlpriv->glb_var->glb_priv_list, list) { - tpcipriv = (struct rtl_pci_priv *)tpriv->priv; + tpcipriv = (struct rtl_pci_priv *)iter->priv;rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD ,"pcipriv->ndis_adapter.funcnumber %x\n" , pcipriv->ndis_adapter.funcnumber);
@@ -344,19 +343,19 @@ static bool rtl_pci_check_buddy_priv(struct ieee80211_hw *hw, tpcipriv->ndis_adapter.devnumber && pcipriv->ndis_adapter.funcnumber != tpcipriv->ndis_adapter.funcnumber) { - find_buddy_priv = true; + tpriv = iter;break ; } } }rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD , -"find_buddy_priv %d\n" , find_buddy_priv); +"find_buddy_priv %d\n" , tpriv !=NULL ); -if (find_buddy_priv) +if (tpriv) *buddy_priv = tpriv; -return find_buddy_priv; +return tpriv !=NULL ; }static void rtl_pci_get_linkcontrol_field (struct ieee80211_hw *hw)
base-commit: f443e374ae131c168a065ea1748feac6b2e76613
Signature · 1 line
2.25.1
Quoted 20 lines
-----Original Message-----
From: Jakob Koschel <[email protected]>
Sent: Thursday, March 24, 2022 3:21 PM
To: Pkshih <[email protected]>
Cc: Kalle Valo <[email protected]>; David S. Miller <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>; [email protected]; [email protected]; [email protected]; Mike Rapoport <[email protected]>; Brian Johannesmeyer <[email protected]>; Cristiano Giuffrida <[email protected]>; Bos, H.J. <[email protected]>; Jakob Koschel <[email protected]>
Subject: [PATCH] rtlwifi: replace usage of found with dedicated list iterator variableTo move the list iterator variable into the list_for_each_entry_*() macro in the future it should be avoided to use the list iterator variable after the loop body.
To *never* use the list iterator variable after the loop it was concluded to use a separate iterator variable instead of a found boolean [1].
Quoted 5 lines
This removes the need to use a found variable and simply checking if the variable was set, can determine if the break/goto was hit.
Thanks.
[...]
Quoted 8 lines · Jakob Koschel
To move the list iterator variable into the list_for_each_entry_*() macro in the future it should be avoided to use the list iterator variable after the loop body.
To *never* use the list iterator variable after the loop it was concluded to use a separate iterator variable instead of a found boolean [1].
Quoted 6 lines
This removes the need to use a found variable and simply checking if the variable was set, can determine if the break/goto was hit.
Patch applied to wireless-next.git, thanks.
a0ff2a87194a rtlwifi: replace usage of found with dedicated list iterator variable
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches