Network namespace support for PIM-SM (IPv6)
Subsystems (3)
PATCH 1/1 Network namespace support for PIM-SM (IPv6)
Here are some minor changes to enable using IPv6 PIM-SM with network namespaces:
- make PIM register vifs netns local
- make PIM available in all network namespaces (if CONFIG_IPV6_PIMSM_V2) by adding the protocol handler when multicast routing is initialized
Signed-off-by Tom Goff <[email protected]>
--- net/ipv6/ip6mr.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-)
net/ipv6/ip6mr.c +7 -8
@@ -442,6 +442,7 @@ static void reg_vif_setup(struct net_device *dev) dev->flags =IFF_NOARP ; dev->netdev_ops = ®_vif_netdev_ops; dev->destructor = free_netdev; + dev->features |=NETIF_F_NETNS_LOCAL ; }static struct net_device *ip6mr_reg_vif (struct net *net)
@@ -1076,6 +1077,12 @@ int __init ip6_mr_init(void)setup_timer (&ipmr_expire_timer, ipmr_expire_process,0 ); err =register_netdevice_notifier (&ip6_mr_notifier); +#ifdef CONFIG_IPV6_PIMSM_V2 +if (inet6_add_protocol (&pim6_protocol,IPPROTO_PIM ) <0 ) { +printk (KERN_ERR "ip6_mr_init: can't add PIM protocol\n" ); + err = -EAGAIN ; + } +#endif if (err) goto reg_notif_fail;return 0 ;
@@ -1364,14 +1371,6 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, intif (v != net->ipv6.mroute_do_pim) { net->ipv6.mroute_do_pim = v; net->ipv6.mroute_do_assert = v; -if (net->ipv6.mroute_do_pim) - ret =inet6_add_protocol (&pim6_protocol, -IPPROTO_PIM ); -else - ret =inet6_del_protocol (&pim6_protocol, -IPPROTO_PIM ); -if (ret <0 ) - ret = -EAGAIN ; }rtnl_unlock ();return ret;
Signature · 1 line
1.6.0.6