[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>
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 0e83164..f93407c 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c
@@ -1314,7 +1314,9 @@ 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 d2b3cf6..48c8d7c 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c
@@ -601,7 +601,9 @@ 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 @@ 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); }