Skip to content

Commit

Permalink
net: x25: Use list_for_each_entry() to simplify code in x25_route.c
Browse files Browse the repository at this point in the history
Convert list_for_each() to list_for_each_entry() where
applicable. This simplifies the code.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Wang Hai authored and David S. Miller committed Jun 10, 2021
1 parent 9e2b7b0 commit bc831fa
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions net/x25/x25_route.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,11 @@ static int x25_add_route(struct x25_address *address, unsigned int sigdigits,
struct net_device *dev)
{
struct x25_route *rt;
struct list_head *entry;
int rc = -EINVAL;

write_lock_bh(&x25_route_list_lock);

list_for_each(entry, &x25_route_list) {
rt = list_entry(entry, struct x25_route, node);

list_for_each_entry(rt, &x25_route_list, node) {
if (!memcmp(&rt->address, address, sigdigits) &&
rt->sigdigits == sigdigits)
goto out;
Expand Down Expand Up @@ -78,14 +75,11 @@ static int x25_del_route(struct x25_address *address, unsigned int sigdigits,
struct net_device *dev)
{
struct x25_route *rt;
struct list_head *entry;
int rc = -EINVAL;

write_lock_bh(&x25_route_list_lock);

list_for_each(entry, &x25_route_list) {
rt = list_entry(entry, struct x25_route, node);

list_for_each_entry(rt, &x25_route_list, node) {
if (!memcmp(&rt->address, address, sigdigits) &&
rt->sigdigits == sigdigits && rt->dev == dev) {
__x25_remove_route(rt);
Expand Down Expand Up @@ -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 *rt, *use = NULL;
struct list_head *entry;

read_lock_bh(&x25_route_list_lock);

list_for_each(entry, &x25_route_list) {
rt = list_entry(entry, struct x25_route, node);

list_for_each_entry(rt, &x25_route_list, node) {
if (!memcmp(&rt->address, addr, rt->sigdigits)) {
if (!use)
use = rt;
Expand Down

0 comments on commit bc831fa

Please sign in to comment.