diff options
author | Denis V. Lunev <den@openvz.org> | 2008-01-10 06:26:13 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:01:29 -0500 |
commit | 4d1169c1e781e5853317c6b75620d678b2c4854e (patch) | |
tree | 69e7a7cf4c0f619d13eec7ff85ab1837f3abaf16 /net/ipv6/route.c | |
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/route.c')
-rw-r--r-- | net/ipv6/route.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index d2b3cf695aff..48c8d7cb9020 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) | |||
601 | 601 | ||
602 | int ip6_ins_rt(struct rt6_info *rt) | 602 | int ip6_ins_rt(struct rt6_info *rt) |
603 | { | 603 | { |
604 | struct nl_info info = {}; | 604 | struct nl_info info = { |
605 | .nl_net = &init_net, | ||
606 | }; | ||
605 | return __ip6_ins_rt(rt, &info); | 607 | return __ip6_ins_rt(rt, &info); |
606 | } | 608 | } |
607 | 609 | ||
@@ -1259,7 +1261,9 @@ static int __ip6_del_rt(struct rt6_info *rt, struct nl_info *info) | |||
1259 | 1261 | ||
1260 | int ip6_del_rt(struct rt6_info *rt) | 1262 | int ip6_del_rt(struct rt6_info *rt) |
1261 | { | 1263 | { |
1262 | struct nl_info info = {}; | 1264 | struct nl_info info = { |
1265 | .nl_net = &init_net, | ||
1266 | }; | ||
1263 | return __ip6_del_rt(rt, &info); | 1267 | return __ip6_del_rt(rt, &info); |
1264 | } | 1268 | } |
1265 | 1269 | ||