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: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wang Hai <wanghai38@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9e2b7b0450
commit
bc831facf8
|
@ -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;
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue