staging: rtl8712: Use list_entry instead of container_of
PATCH 1/1 staging: rtl8712: Use list_entry instead of container_of
Use list_entry() instead of container_of() for conversion to wlan_network.
--- drivers/staging/rtl8712/rtl871x_mlme.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8712/rtl871x_mlme.c +6 -6
@@ -142,7 +142,7 @@ static struct wlan_network *_r8712_find_network(struct __queue *scanned_queue, phead = &scanned_queue->queue; plist = phead->next;while (plist != phead) { - pnetwork = container_of(plist, struct wlan_network, list); + pnetwork = list_entry(plist, struct wlan_network, list); plist = plist->next;if (!memcmp (addr, pnetwork->network.MacAddress,ETH_ALEN ))break ;
@@ -163,7 +163,7 @@ static void _free_network_queue(struct _adapter *padapter) phead = &scanned_queue->queue; plist = phead->next;while (!end_of_queue_search (phead, plist)) { - pnetwork = container_of(plist, struct wlan_network, list); + pnetwork = list_entry(plist, struct wlan_network, list); plist = plist->next;_free_network (pmlmepriv, pnetwork); }
@@ -290,7 +290,7 @@ struct wlan_network *r8712_get_oldest_wlan_network( while (1) { if (end_of_queue_search(phead, plist) == true) break; - pwlan = container_of(plist, struct wlan_network, list); + pwlan = list_entry(plist, struct wlan_network, list); if (pwlan->fixed != true) { if (oldest == NULL || time_after((unsigned long)oldest->last_scanned,
@@ -371,7 +371,7 @@ static void update_scanned_network(struct _adapter *adapter,if (end_of_queue_search (phead, plist))break ; - pnetwork = container_of(plist, struct wlan_network, list); + pnetwork = list_entry(plist, struct wlan_network, list);if (is_same_network (&pnetwork->network, target))break ; if ((oldest == ((struct wlan_network *)0)) ||
@@ -1118,8 +1118,8 @@ int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv) }return _FAIL; } - pnetwork =container_of (pmlmepriv->pscanned, - struct wlan_network, list); + pnetwork =list_entry (pmlmepriv->pscanned, + struct wlan_network, list);if (pnetwork ==NULL )return _FAIL; pmlmepriv->pscanned = pmlmepriv->pscanned->next;
Signature · 1 line
2.17.1
Quoted 2 lines · Himadri Pandya
Use
list_entry()instead ofcontainer_of()for conversion towlan_network.
Some issues:
Can list_for_each or list_for_each_entry be used for any of this code?
In the last hunk, can the call to container_of/list_entry ever actually return NULL?
With respect to the first, it may be helpful to look at the result of make drivers/staging/rtl8712/rtl871x_mlme.i before and after the change to see if the code looks the same in each case after macro expansion.
julia
Quoted 67 lines
Signed-off-by Himadri Pandya <[email protected]>--- drivers/staging/rtl8712/rtl871x_mlme.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/staging/rtl8712/rtl871x_mlme.c +6
-7@@ -142,7 +142,7 @@ static struct wlan_network *_r8712_find_network(struct __queue *scanned_queue, phead = &scanned_queue->queue; plist = phead->next;while (plist != phead) { - pnetwork = container_of(plist, struct wlan_network, list); + pnetwork = list_entry(plist, struct wlan_network, list); plist = plist->next;if (!memcmp (addr, pnetwork->network.MacAddress,ETH_ALEN ))break ;@@ -163,7 +163,7 @@ static void _free_network_queue(struct _adapter *padapter) phead = &scanned_queue->queue; plist = phead->next;while (!end_of_queue_search (phead, plist)) { - pnetwork = container_of(plist, struct wlan_network, list); + pnetwork = list_entry(plist, struct wlan_network, list); plist = plist->next;_free_network (pmlmepriv, pnetwork); }@@ -290,7 +290,7 @@ struct wlan_network *r8712_get_oldest_wlan_network( while (1) { if (end_of_queue_search(phead, plist) == true) break; - pwlan = container_of(plist, struct wlan_network, list); + pwlan = list_entry(plist, struct wlan_network, list); if (pwlan->fixed != true) { if (oldest == NULL || time_after((unsigned long)oldest->last_scanned,@@ -371,7 +371,7 @@ static void update_scanned_network(struct _adapter *adapter,if (end_of_queue_search (phead, plist))break ; - pnetwork = container_of(plist, struct wlan_network, list); + pnetwork = list_entry(plist, struct wlan_network, list);if (is_same_network (&pnetwork->network, target))break ; if ((oldest == ((struct wlan_network *)0)) ||@@ -1118,8 +1118,8 @@ int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv) }return _FAIL; } - pnetwork =container_of (pmlmepriv->pscanned, - struct wlan_network, list); + pnetwork =list_entry (pmlmepriv->pscanned, + struct wlan_network, list);if (pnetwork ==NULL )return _FAIL; pmlmepriv->pscanned = pmlmepriv->pscanned->next; --2.17.1
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20190326203349.9048-1-himadri18.07%40gmail.com.
For more options, visit https://groups.google.com/d/optout.
Quoted 11 lines · Julia Lawall
Quoted 2 lines · Himadri Pandya
Use
list_entry()instead ofcontainer_of()for conversion towlan_network.Some issues:
Can
list_for_eachorlist_for_each_entrybe used for any of this code?
Yes. Sending version 2 with usage of these macros.
Quoted 3 lines
In the last hunk, can the call to container_of/list_entry ever actually return NULL?
No. Removing the comparison in version 2.
Quoted 7 lines
With respect to the first, it may be helpful to look at the result of make
drivers/staging/rtl8712/rtl871x_mlme.ibefore and after the change to see if the code looks the same in each case after macro expansion.julia
Thank you.
- Himadri
Quoted 90 lines
Review
Quoted 8 lines
Signed-off-by Himadri Pandya <[email protected]>--- drivers/staging/rtl8712/rtl871x_mlme.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)(quoted diff) +0
-0
b/drivers/staging/rtl8712/rtl871x_mlme.cdrivers/staging/rtl8712/rtl871x_mlme.c static struct wlan_network
Quoted 4 lines
index
c666e038f43e..5b1fc327fbd2100644drivers/staging/rtl8712/rtl871x_mlme.c +0
-0@@ -142,7 +142,7 @@ static struct wlan_network*_r8712_find_network(struct
__queue*scanned_queue,drivers/staging/rtl8712/rtl871x_mlme.c static void _free_network_queue(struct _adapter
Quoted 9 lines
drivers/staging/rtl8712/rtl871x_mlme.c +1
-1phead = &scanned_queue->queue; plist = phead->next;while (plist != phead) { - pnetwork = container_of(plist, struct wlan_network, list); + pnetwork = list_entry(plist, struct wlan_network, list); plist = plist->next;if (!memcmp (addr, pnetwork->network.MacAddress,ETH_ALEN ))break ;@@ -163,7 +163,7 @@ static void _free_network_queue(struct _adapter*padapter)
drivers/staging/rtl8712/rtl871x_mlme.c struct wlan_network
Quoted 9 lines
drivers/staging/rtl8712/rtl871x_mlme.c +1
-1phead = &scanned_queue->queue; plist = phead->next;while (!end_of_queue_search (phead, plist)) { - pnetwork = container_of(plist, struct wlan_network, list); + pnetwork = list_entry(plist, struct wlan_network, list); plist = plist->next;_free_network (pmlmepriv, pnetwork); }@@ -290,7 +290,7 @@ struct wlan_network*r8712_get_oldest_wlan_network(
drivers/staging/rtl8712/rtl871x_mlme.c static void update_scanned_network(struct _adapter
Quoted 9 lines
drivers/staging/rtl8712/rtl871x_mlme.c +1
-1while (1) { if (end_of_queue_search(phead, plist) == true) break; - pwlan = container_of(plist, struct wlan_network, list); + pwlan = list_entry(plist, struct wlan_network, list); if (pwlan->fixed != true) { if (oldest == NULL || time_after((unsigned long)oldest->last_scanned,@@ -371,7 +371,7 @@ static void update_scanned_network(struct _adapter*adapter,
drivers/staging/rtl8712/rtl871x_mlme.c int r8712_select_and_join_from_scan(struct
Quoted 9 lines
drivers/staging/rtl8712/rtl871x_mlme.c +1
-1if (end_of_queue_search (phead, plist))break ; - pnetwork = container_of(plist, struct wlan_network, list); + pnetwork = list_entry(plist, struct wlan_network, list);if (is_same_network (&pnetwork->network, target))break ; if ((oldest == ((struct wlan_network *)0)) ||@@ -1118,8 +1118,8 @@ int r8712_select_and_join_from_scan(struct
mlme_priv*pmlmepriv)Quoted 13 lines
drivers/staging/rtl8712/rtl871x_mlme.c +2
-3}return _FAIL; } - pnetwork =container_of (pmlmepriv->pscanned, - struct wlan_network, list); + pnetwork =list_entry (pmlmepriv->pscanned, + struct wlan_network, list);if (pnetwork ==NULL )return _FAIL; pmlmepriv->pscanned = pmlmepriv->pscanned->next; --2.17.1
Quoted 2 lines
--
You received this message because you are subscribed to the GoogleGroups "outreachy-kernel" group.
Quoted 1 line
To unsubscribe from this group and stop receiving emails from it, send
an email to [email protected].
Quoted 2 lines
To post to this group, send email to [email protected]. To view this discussion on the web visit
https://groups.google.com/d/msgid/outreachy-kernel/20190326203349.9048-1-himadri18.07%40gmail.com
.Quoted 2 lines
For more options, visit https://groups.google.com/d/optout.
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected]. To view this discussion on the web visit
https://groups.google.com/d/msgid/outreachy-kernel/alpine.DEB.2.21.1903262138130.3044%40hadrien
.
For more options, visit https://groups.google.com/d/optout.