diff options
Diffstat (limited to 'net/decnet/dn_table.c')
-rw-r--r-- | net/decnet/dn_table.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c index 67054b0d550f..f2abd3755690 100644 --- a/net/decnet/dn_table.c +++ b/net/decnet/dn_table.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/string.h> | 15 | #include <linux/string.h> |
16 | #include <linux/net.h> | 16 | #include <linux/net.h> |
17 | #include <linux/socket.h> | 17 | #include <linux/socket.h> |
18 | #include <linux/slab.h> | ||
18 | #include <linux/sockios.h> | 19 | #include <linux/sockios.h> |
19 | #include <linux/init.h> | 20 | #include <linux/init.h> |
20 | #include <linux/skbuff.h> | 21 | #include <linux/skbuff.h> |
@@ -471,7 +472,7 @@ int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb) | |||
471 | struct hlist_node *node; | 472 | struct hlist_node *node; |
472 | int dumped = 0; | 473 | int dumped = 0; |
473 | 474 | ||
474 | if (net != &init_net) | 475 | if (!net_eq(net, &init_net)) |
475 | return 0; | 476 | return 0; |
476 | 477 | ||
477 | if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) && | 478 | if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) && |
@@ -581,8 +582,9 @@ static int dn_fib_table_insert(struct dn_fib_table *tb, struct rtmsg *r, struct | |||
581 | DN_FIB_SCAN_KEY(f, fp, key) { | 582 | DN_FIB_SCAN_KEY(f, fp, key) { |
582 | if (fi->fib_priority != DN_FIB_INFO(f)->fib_priority) | 583 | if (fi->fib_priority != DN_FIB_INFO(f)->fib_priority) |
583 | break; | 584 | break; |
584 | if (f->fn_type == type && f->fn_scope == r->rtm_scope | 585 | if (f->fn_type == type && |
585 | && DN_FIB_INFO(f) == fi) | 586 | f->fn_scope == r->rtm_scope && |
587 | DN_FIB_INFO(f) == fi) | ||
586 | goto out; | 588 | goto out; |
587 | } | 589 | } |
588 | 590 | ||