2023-02-11 17:02:39

by Martin Kaiser

Subject: [PATCH] staging: r8188eu: replace hand coded loop with list_for_each_entry

In function rtw_get_stainfo, we can use list_for_each_entry to iterate
over the list of stations and make the code a bit simpler.

Signed-off-by: Martin Kaiser <[email protected]>
---
drivers/staging/r8188eu/core/rtw_sta_mgt.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
index a9c29b2bf230..e1ae1859686e 100644
--- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c
+++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
@@ -391,8 +391,7 @@ void rtw_free_all_stainfo(struct adapter *padapter)
/* any station allocated can be searched by hash list */
struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
{
- struct list_head *plist, *phead;
- struct sta_info *psta = NULL;
+ struct sta_info *ploop, *psta = NULL;
u32 index;
u8 *addr;
u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
@@ -409,18 +408,11 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)

spin_lock_bh(&pstapriv->sta_hash_lock);

- phead = &pstapriv->sta_hash[index];
- plist = phead->next;
-
- while (phead != plist) {
- psta = container_of(plist, struct sta_info, hash_list);
-
- if ((!memcmp(psta->hwaddr, addr, ETH_ALEN))) {
- /* if found the matched address */
+ list_for_each_entry(ploop, &pstapriv->sta_hash[index], hash_list) {
+ if (!memcmp(ploop->hwaddr, addr, ETH_ALEN)) {
+ psta = ploop;
break;
}
- psta = NULL;
- plist = plist->next;
}

spin_unlock_bh(&pstapriv->sta_hash_lock);
--
2.30.2

2023-02-13 19:24:17

by Philipp Hortmann

Subject: Re: [PATCH] staging: r8188eu: replace hand coded loop with list_for_each_entry

On 2/11/23 18:02, Martin Kaiser wrote:
> In function rtw_get_stainfo, we can use list_for_each_entry to iterate
> over the list of stations and make the code a bit simpler.
>
> Signed-off-by: Martin Kaiser <[email protected]>
> ---
> drivers/staging/r8188eu/core/rtw_sta_mgt.c | 16 ++++------------
> 1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
> index a9c29b2bf230..e1ae1859686e 100644
> --- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c
> +++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
> @@ -391,8 +391,7 @@ void rtw_free_all_stainfo(struct adapter *padapter)
> /* any station allocated can be searched by hash list */
> struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
> {
> - struct list_head *plist, *phead;
> - struct sta_info *psta = NULL;
> + struct sta_info *ploop, *psta = NULL;
> u32 index;
> u8 *addr;
> u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
> @@ -409,18 +408,11 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
>
> spin_lock_bh(&pstapriv->sta_hash_lock);
>
> - phead = &pstapriv->sta_hash[index];
> - plist = phead->next;
> -
> - while (phead != plist) {
> - psta = container_of(plist, struct sta_info, hash_list);
> -
> - if ((!memcmp(psta->hwaddr, addr, ETH_ALEN))) {
> - /* if found the matched address */
> + list_for_each_entry(ploop, &pstapriv->sta_hash[index], hash_list) {
> + if (!memcmp(ploop->hwaddr, addr, ETH_ALEN)) {
> + psta = ploop;
> break;
> }
> - psta = NULL;
> - plist = plist->next;
> }
>
> spin_unlock_bh(&pstapriv->sta_hash_lock);

Tested-by: Philipp Hortmann <[email protected]> # Edimax N150