diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-01-10 03:26:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:01:29 -0800 |
| commit | 4d1169c1e781e5853317c6b75620d678b2c4854e (patch) | |
| tree | 69e7a7cf4c0f619d13eec7ff85ab1837f3abaf16 /net/ipv6 | |
| parent | 6b175b26c1048d331508940ad3516ead1998084f (diff) | |
[NETNS]: Add netns to nl_info structure.
nl_info is used to track the end-user destination of routing change
notification. This is a natural object to hold a namespace on. Place
it there and utilize the context in the appropriate places.
Acked-by: Benjamin Thery <benjamin.thery@bull.net>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_fib.c | 4 | ||||
| -rw-r--r-- | net/ipv6/route.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 0e83164aa3e..f93407cf651 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -1314,7 +1314,9 @@ static int fib6_walk(struct fib6_walker_t *w) static int fib6_clean_node(struct fib6_walker_t *w) { - struct nl_info info = {}; + struct nl_info info = { + .nl_net = &init_net, + }; int res; struct rt6_info *rt; struct fib6_cleaner_t *c = container_of(w, struct fib6_cleaner_t, w); diff --git a/net/ipv6/route.c b/net/ipv6/route.c index d2b3cf695af..48c8d7cb902 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -601,7 +601,9 @@ static int __ip6_ins_rt(struct rt6_info *rt, struct nl_info *info) int ip6_ins_rt(struct rt6_info *rt) { - struct nl_info info = {}; + struct nl_info info = { + .nl_net = &init_net, + }; return __ip6_ins_rt(rt, &info); } @@ -1259,7 +1261,9 @@ static int __ip6_del_rt(struct rt6_info *rt, struct nl_info *info) int ip6_del_rt(struct rt6_info *rt) { - struct nl_info info = {}; + struct nl_info info = { + .nl_net = &init_net, + }; return __ip6_del_rt(rt, &info); } |