Skip to content

Commit

Permalink
net: x25: convert to list_for_each_entry_safe()
Browse files Browse the repository at this point in the history 
Use list_for_each_entry_safe() instead of list_for_each_safe()
to simplify the code.

Signed-off-by: chenqiwu <chenqiwu@xiaomi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
chenqiwu authored and David S. Miller committed Feb 17, 2020
1 parent 1f4c51d commit 1e5946f
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions net/x25/x25_forward.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit 1e5946f

Please sign in to comment.