Commit bc831fac authored by Wang Hai's avatar Wang Hai Committed by David S. Miller

net: x25: Use list_for_each_entry() to simplify code in x25_route.c

Convert list_for_each() to list_for_each_entry() where
applicable. This simplifies the code.
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e2b7b04
...@@ -27,14 +27,11 @@ static int x25_add_route(struct x25_address *address, unsigned int sigdigits, ...@@ -27,14 +27,11 @@ static int x25_add_route(struct x25_address *address, unsigned int sigdigits,
struct net_device *dev) struct net_device *dev)
{ {
struct x25_route *rt; struct x25_route *rt;
struct list_head *entry;
int rc = -EINVAL; int rc = -EINVAL;
write_lock_bh(&x25_route_list_lock); write_lock_bh(&x25_route_list_lock);
list_for_each(entry, &x25_route_list) { list_for_each_entry(rt, &x25_route_list, node) {
rt = list_entry(entry, struct x25_route, node);
if (!memcmp(&rt->address, address, sigdigits) && if (!memcmp(&rt->address, address, sigdigits) &&
rt->sigdigits == sigdigits) rt->sigdigits == sigdigits)
goto out; goto out;
...@@ -78,14 +75,11 @@ static int x25_del_route(struct x25_address *address, unsigned int sigdigits, ...@@ -78,14 +75,11 @@ static int x25_del_route(struct x25_address *address, unsigned int sigdigits,
struct net_device *dev) struct net_device *dev)
{ {
struct x25_route *rt; struct x25_route *rt;
struct list_head *entry;
int rc = -EINVAL; int rc = -EINVAL;
write_lock_bh(&x25_route_list_lock); write_lock_bh(&x25_route_list_lock);
list_for_each(entry, &x25_route_list) { list_for_each_entry(rt, &x25_route_list, node) {
rt = list_entry(entry, struct x25_route, node);
if (!memcmp(&rt->address, address, sigdigits) && if (!memcmp(&rt->address, address, sigdigits) &&
rt->sigdigits == sigdigits && rt->dev == dev) { rt->sigdigits == sigdigits && rt->dev == dev) {
__x25_remove_route(rt); __x25_remove_route(rt);
...@@ -141,13 +135,10 @@ struct net_device *x25_dev_get(char *devname) ...@@ -141,13 +135,10 @@ struct net_device *x25_dev_get(char *devname)
struct x25_route *x25_get_route(struct x25_address *addr) struct x25_route *x25_get_route(struct x25_address *addr)
{ {
struct x25_route *rt, *use = NULL; struct x25_route *rt, *use = NULL;
struct list_head *entry;
read_lock_bh(&x25_route_list_lock); read_lock_bh(&x25_route_list_lock);
list_for_each(entry, &x25_route_list) { list_for_each_entry(rt, &x25_route_list, node) {
rt = list_entry(entry, struct x25_route, node);
if (!memcmp(&rt->address, addr, rt->sigdigits)) { if (!memcmp(&rt->address, addr, rt->sigdigits)) {
if (!use) if (!use)
use = rt; use = rt;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment