diff options
| author | Denis V. Lunev | 2007-11-20 07:26:51 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-01-28 23:54:25 +0100 |
| commit | 97c53cacf00d1f5aa04adabfebcc806ca8b22b10 (patch) | |
| tree | 6b7223df312aa27a5017c4d7c4d1e500a33ed8d8 /net/ipv6/route.c | |
| parent | [NET]: Modify all rtnetlink methods to only work in the initial namespace (v2) (diff) | |
| download | kernel-qcow2-linux-97c53cacf00d1f5aa04adabfebcc806ca8b22b10.tar.gz kernel-qcow2-linux-97c53cacf00d1f5aa04adabfebcc806ca8b22b10.tar.xz kernel-qcow2-linux-97c53cacf00d1f5aa04adabfebcc806ca8b22b10.zip | |
[NET]: Make rtnetlink infrastructure network namespace aware (v3)
After this patch none of the netlink callback support anything
except the initial network namespace but the rtnetlink infrastructure
now handles multiple network namespaces.
Changes from v2:
- IPv6 addrlabel processing
Changes from v1:
- no need for special rtnl_unlock handling
- fixed IPv6 ndisc
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 5e1c5796761b..d7ec4c9ffc4b 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2230,7 +2230,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void goto errout; } - err = rtnl_unicast(skb, NETLINK_CB(in_skb).pid); + err = rtnl_unicast(skb, &init_net, NETLINK_CB(in_skb).pid); errout: return err; } @@ -2260,10 +2260,10 @@ void inet6_rt_notify(int event, struct rt6_info *rt, struct nl_info *info) kfree_skb(skb); goto errout; } - err = rtnl_notify(skb, pid, RTNLGRP_IPV6_ROUTE, nlh, gfp_any()); + err = rtnl_notify(skb, &init_net, pid, RTNLGRP_IPV6_ROUTE, nlh, gfp_any()); errout: if (err < 0) - rtnl_set_sk_err(RTNLGRP_IPV6_ROUTE, err); + rtnl_set_sk_err(&init_net, RTNLGRP_IPV6_ROUTE, err); } /* |