diff options
author | Denis V. Lunev <den@openvz.org> | 2007-11-20 01:26:51 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:54:25 -0500 |
commit | 97c53cacf00d1f5aa04adabfebcc806ca8b22b10 (patch) | |
tree | 6b7223df312aa27a5017c4d7c4d1e500a33ed8d8 /net/ipv4/ipmr.c | |
parent | b854272b3c732316676e9128f7b9e6f1e1ff88b0 (diff) |
[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/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 8e5d47a60602..11879283ad52 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -321,7 +321,7 @@ static void ipmr_destroy_unres(struct mfc_cache *c) | |||
321 | e->error = -ETIMEDOUT; | 321 | e->error = -ETIMEDOUT; |
322 | memset(&e->msg, 0, sizeof(e->msg)); | 322 | memset(&e->msg, 0, sizeof(e->msg)); |
323 | 323 | ||
324 | rtnl_unicast(skb, NETLINK_CB(skb).pid); | 324 | rtnl_unicast(skb, &init_net, NETLINK_CB(skb).pid); |
325 | } else | 325 | } else |
326 | kfree_skb(skb); | 326 | kfree_skb(skb); |
327 | } | 327 | } |
@@ -533,7 +533,7 @@ static void ipmr_cache_resolve(struct mfc_cache *uc, struct mfc_cache *c) | |||
533 | memset(&e->msg, 0, sizeof(e->msg)); | 533 | memset(&e->msg, 0, sizeof(e->msg)); |
534 | } | 534 | } |
535 | 535 | ||
536 | rtnl_unicast(skb, NETLINK_CB(skb).pid); | 536 | rtnl_unicast(skb, &init_net, NETLINK_CB(skb).pid); |
537 | } else | 537 | } else |
538 | ip_mr_forward(skb, c, 0); | 538 | ip_mr_forward(skb, c, 0); |
539 | } | 539 | } |