diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-09-27 01:10:56 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:52:49 -0400 |
commit | 2774c7aba6c97a2535be3309a2209770953780b3 (patch) | |
tree | 9327c795707f6d723c6395c31e1c060e70b5e0db /net/ipv6 | |
parent | 0cc217e16cb8ca8ef2544363571fce94259900e0 (diff) |
[NET]: Make the loopback device per network namespace.
This patch makes loopback_dev per network namespace. Adding
code to create a different loopback device for each network
namespace and adding the code to free a loopback device
when a network namespace exits.
This patch modifies all users the loopback_dev so they
access it as init_net.loopback_dev, keeping all of the
code compiling and working. A later pass will be needed to
update the users to use something other than the initial network
namespace.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/addrconf.c | 18 | ||||
-rw-r--r-- | net/ipv6/netfilter/ip6t_REJECT.c | 2 | ||||
-rw-r--r-- | net/ipv6/route.c | 12 | ||||
-rw-r--r-- | net/ipv6/xfrm6_policy.c | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index b43574f73375..6d5c3c299148 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -2410,7 +2410,7 @@ static int addrconf_ifdown(struct net_device *dev, int how) | |||
2410 | 2410 | ||
2411 | ASSERT_RTNL(); | 2411 | ASSERT_RTNL(); |
2412 | 2412 | ||
2413 | if (dev == loopback_dev && how == 1) | 2413 | if (dev == init_net.loopback_dev && how == 1) |
2414 | how = 0; | 2414 | how = 0; |
2415 | 2415 | ||
2416 | rt6_ifdown(dev); | 2416 | rt6_ifdown(dev); |
@@ -4212,19 +4212,19 @@ int __init addrconf_init(void) | |||
4212 | * device and it being up should be removed. | 4212 | * device and it being up should be removed. |
4213 | */ | 4213 | */ |
4214 | rtnl_lock(); | 4214 | rtnl_lock(); |
4215 | if (!ipv6_add_dev(loopback_dev)) | 4215 | if (!ipv6_add_dev(init_net.loopback_dev)) |
4216 | err = -ENOMEM; | 4216 | err = -ENOMEM; |
4217 | rtnl_unlock(); | 4217 | rtnl_unlock(); |
4218 | if (err) | 4218 | if (err) |
4219 | return err; | 4219 | return err; |
4220 | 4220 | ||
4221 | ip6_null_entry.u.dst.dev = loopback_dev; | 4221 | ip6_null_entry.u.dst.dev = init_net.loopback_dev; |
4222 | ip6_null_entry.rt6i_idev = in6_dev_get(loopback_dev); | 4222 | ip6_null_entry.rt6i_idev = in6_dev_get(init_net.loopback_dev); |
4223 | #ifdef CONFIG_IPV6_MULTIPLE_TABLES | 4223 | #ifdef CONFIG_IPV6_MULTIPLE_TABLES |
4224 | ip6_prohibit_entry.u.dst.dev = loopback_dev; | 4224 | ip6_prohibit_entry.u.dst.dev = init_net.loopback_dev; |
4225 | ip6_prohibit_entry.rt6i_idev = in6_dev_get(loopback_dev); | 4225 | ip6_prohibit_entry.rt6i_idev = in6_dev_get(init_net.loopback_dev); |
4226 | ip6_blk_hole_entry.u.dst.dev = loopback_dev; | 4226 | ip6_blk_hole_entry.u.dst.dev = init_net.loopback_dev; |
4227 | ip6_blk_hole_entry.rt6i_idev = in6_dev_get(loopback_dev); | 4227 | ip6_blk_hole_entry.rt6i_idev = in6_dev_get(init_net.loopback_dev); |
4228 | #endif | 4228 | #endif |
4229 | 4229 | ||
4230 | register_netdevice_notifier(&ipv6_dev_notf); | 4230 | register_netdevice_notifier(&ipv6_dev_notf); |
@@ -4279,7 +4279,7 @@ void __exit addrconf_cleanup(void) | |||
4279 | continue; | 4279 | continue; |
4280 | addrconf_ifdown(dev, 1); | 4280 | addrconf_ifdown(dev, 1); |
4281 | } | 4281 | } |
4282 | addrconf_ifdown(loopback_dev, 2); | 4282 | addrconf_ifdown(init_net.loopback_dev, 2); |
4283 | 4283 | ||
4284 | /* | 4284 | /* |
4285 | * Check hash table. | 4285 | * Check hash table. |
diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c index 50860531cd3c..3fd08d5567a6 100644 --- a/net/ipv6/netfilter/ip6t_REJECT.c +++ b/net/ipv6/netfilter/ip6t_REJECT.c | |||
@@ -167,7 +167,7 @@ static inline void | |||
167 | send_unreach(struct sk_buff *skb_in, unsigned char code, unsigned int hooknum) | 167 | send_unreach(struct sk_buff *skb_in, unsigned char code, unsigned int hooknum) |
168 | { | 168 | { |
169 | if (hooknum == NF_IP6_LOCAL_OUT && skb_in->dev == NULL) | 169 | if (hooknum == NF_IP6_LOCAL_OUT && skb_in->dev == NULL) |
170 | skb_in->dev = loopback_dev; | 170 | skb_in->dev = init_net.loopback_dev; |
171 | 171 | ||
172 | icmpv6_send(skb_in, ICMPV6_DEST_UNREACH, code, 0, NULL); | 172 | icmpv6_send(skb_in, ICMPV6_DEST_UNREACH, code, 0, NULL); |
173 | } | 173 | } |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index a7a21a7ba790..6ff19f9eb9ee 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -221,8 +221,8 @@ static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, | |||
221 | struct rt6_info *rt = (struct rt6_info *)dst; | 221 | struct rt6_info *rt = (struct rt6_info *)dst; |
222 | struct inet6_dev *idev = rt->rt6i_idev; | 222 | struct inet6_dev *idev = rt->rt6i_idev; |
223 | 223 | ||
224 | if (dev != loopback_dev && idev != NULL && idev->dev == dev) { | 224 | if (dev != init_net.loopback_dev && idev != NULL && idev->dev == dev) { |
225 | struct inet6_dev *loopback_idev = in6_dev_get(loopback_dev); | 225 | struct inet6_dev *loopback_idev = in6_dev_get(init_net.loopback_dev); |
226 | if (loopback_idev != NULL) { | 226 | if (loopback_idev != NULL) { |
227 | rt->rt6i_idev = loopback_idev; | 227 | rt->rt6i_idev = loopback_idev; |
228 | in6_dev_put(idev); | 228 | in6_dev_put(idev); |
@@ -1185,12 +1185,12 @@ int ip6_route_add(struct fib6_config *cfg) | |||
1185 | if ((cfg->fc_flags & RTF_REJECT) || | 1185 | if ((cfg->fc_flags & RTF_REJECT) || |
1186 | (dev && (dev->flags&IFF_LOOPBACK) && !(addr_type&IPV6_ADDR_LOOPBACK))) { | 1186 | (dev && (dev->flags&IFF_LOOPBACK) && !(addr_type&IPV6_ADDR_LOOPBACK))) { |
1187 | /* hold loopback dev/idev if we haven't done so. */ | 1187 | /* hold loopback dev/idev if we haven't done so. */ |
1188 | if (dev != loopback_dev) { | 1188 | if (dev != init_net.loopback_dev) { |
1189 | if (dev) { | 1189 | if (dev) { |
1190 | dev_put(dev); | 1190 | dev_put(dev); |
1191 | in6_dev_put(idev); | 1191 | in6_dev_put(idev); |
1192 | } | 1192 | } |
1193 | dev = loopback_dev; | 1193 | dev = init_net.loopback_dev; |
1194 | dev_hold(dev); | 1194 | dev_hold(dev); |
1195 | idev = in6_dev_get(dev); | 1195 | idev = in6_dev_get(dev); |
1196 | if (!idev) { | 1196 | if (!idev) { |
@@ -1894,13 +1894,13 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev, | |||
1894 | if (rt == NULL) | 1894 | if (rt == NULL) |
1895 | return ERR_PTR(-ENOMEM); | 1895 | return ERR_PTR(-ENOMEM); |
1896 | 1896 | ||
1897 | dev_hold(loopback_dev); | 1897 | dev_hold(init_net.loopback_dev); |
1898 | in6_dev_hold(idev); | 1898 | in6_dev_hold(idev); |
1899 | 1899 | ||
1900 | rt->u.dst.flags = DST_HOST; | 1900 | rt->u.dst.flags = DST_HOST; |
1901 | rt->u.dst.input = ip6_input; | 1901 | rt->u.dst.input = ip6_input; |
1902 | rt->u.dst.output = ip6_output; | 1902 | rt->u.dst.output = ip6_output; |
1903 | rt->rt6i_dev = loopback_dev; | 1903 | rt->rt6i_dev = init_net.loopback_dev; |
1904 | rt->rt6i_idev = idev; | 1904 | rt->rt6i_idev = idev; |
1905 | rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(rt->rt6i_dev); | 1905 | rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(rt->rt6i_dev); |
1906 | rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_mtu(&rt->u.dst)); | 1906 | rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(dst_mtu(&rt->u.dst)); |
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index cc07216cfd59..15aa4c58c315 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
@@ -375,7 +375,7 @@ static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, | |||
375 | 375 | ||
376 | xdst = (struct xfrm_dst *)dst; | 376 | xdst = (struct xfrm_dst *)dst; |
377 | if (xdst->u.rt6.rt6i_idev->dev == dev) { | 377 | if (xdst->u.rt6.rt6i_idev->dev == dev) { |
378 | struct inet6_dev *loopback_idev = in6_dev_get(loopback_dev); | 378 | struct inet6_dev *loopback_idev = in6_dev_get(init_net.loopback_dev); |
379 | BUG_ON(!loopback_idev); | 379 | BUG_ON(!loopback_idev); |
380 | 380 | ||
381 | do { | 381 | do { |