* [PATCH] net: x25: convert to list_for_each_entry_safe()
@ 2020-02-14 9:18 qiwuchen55
2020-02-17 2:59 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: qiwuchen55 @ 2020-02-14 9:18 UTC (permalink / raw)
To: andrew.hendry, davem, kuba; +Cc: allison, tglx, linux-x25, netdev, chenqiwu
From: chenqiwu <chenqiwu@xiaomi.com>
Use list_for_each_entry_safe() instead of list_for_each_safe()
to simplify the code.
Signed-off-by: chenqiwu <chenqiwu@xiaomi.com>
---
net/x25/x25_forward.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/net/x25/x25_forward.c b/net/x25/x25_forward.c
index c829999..d48ad6d 100644
--- a/net/x25/x25_forward.c
+++ b/net/x25/x25_forward.c
@@ -131,13 +131,11 @@ int x25_forward_data(int lci, struct x25_neigh *from, struct sk_buff *skb) {
void x25_clear_forward_by_lci(unsigned int lci)
{
- struct x25_forward *fwd;
- struct list_head *entry, *tmp;
+ struct x25_forward *fwd, *tmp;
write_lock_bh(&x25_forward_list_lock);
- list_for_each_safe(entry, tmp, &x25_forward_list) {
- fwd = list_entry(entry, struct x25_forward, node);
+ list_for_each_entry_safe(fwd, tmp, &x25_forward_list, node) {
if (fwd->lci == lci) {
list_del(&fwd->node);
kfree(fwd);
@@ -149,13 +147,11 @@ void x25_clear_forward_by_lci(unsigned int lci)
void x25_clear_forward_by_dev(struct net_device *dev)
{
- struct x25_forward *fwd;
- struct list_head *entry, *tmp;
+ struct x25_forward *fwd, *tmp;
write_lock_bh(&x25_forward_list_lock);
- list_for_each_safe(entry, tmp, &x25_forward_list) {
- fwd = list_entry(entry, struct x25_forward, node);
+ list_for_each_entry_safe(fwd, tmp, &x25_forward_list, node) {
if ((fwd->dev1 == dev) || (fwd->dev2 == dev)){
list_del(&fwd->node);
kfree(fwd);
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: x25: convert to list_for_each_entry_safe()
2020-02-14 9:18 [PATCH] net: x25: convert to list_for_each_entry_safe() qiwuchen55
@ 2020-02-17 2:59 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-02-17 2:59 UTC (permalink / raw)
To: qiwuchen55
Cc: andrew.hendry, kuba, allison, tglx, linux-x25, netdev, chenqiwu
From: qiwuchen55@gmail.com
Date: Fri, 14 Feb 2020 17:18:26 +0800
> From: chenqiwu <chenqiwu@xiaomi.com>
>
> Use list_for_each_entry_safe() instead of list_for_each_safe()
> to simplify the code.
>
> Signed-off-by: chenqiwu <chenqiwu@xiaomi.com>
Applied to net-next.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-17 2:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-14 9:18 [PATCH] net: x25: convert to list_for_each_entry_safe() qiwuchen55
2020-02-17 2:59 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).