diff options
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index ca774d8e3be3..937625e577c1 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
@@ -235,7 +235,7 @@ static struct ip6_tnl *ip6_tnl_create(struct ip6_tnl_parm *p) | |||
235 | int i; | 235 | int i; |
236 | for (i = 1; i < IP6_TNL_MAX; i++) { | 236 | for (i = 1; i < IP6_TNL_MAX; i++) { |
237 | sprintf(name, "ip6tnl%d", i); | 237 | sprintf(name, "ip6tnl%d", i); |
238 | if (__dev_get_by_name(name) == NULL) | 238 | if (__dev_get_by_name(&init_net, name) == NULL) |
239 | break; | 239 | break; |
240 | } | 240 | } |
241 | if (i == IP6_TNL_MAX) | 241 | if (i == IP6_TNL_MAX) |
@@ -650,7 +650,7 @@ static inline int ip6_tnl_rcv_ctl(struct ip6_tnl *t) | |||
650 | struct net_device *ldev = NULL; | 650 | struct net_device *ldev = NULL; |
651 | 651 | ||
652 | if (p->link) | 652 | if (p->link) |
653 | ldev = dev_get_by_index(p->link); | 653 | ldev = dev_get_by_index(&init_net, p->link); |
654 | 654 | ||
655 | if ((ipv6_addr_is_multicast(&p->laddr) || | 655 | if ((ipv6_addr_is_multicast(&p->laddr) || |
656 | likely(ipv6_chk_addr(&p->laddr, ldev, 0))) && | 656 | likely(ipv6_chk_addr(&p->laddr, ldev, 0))) && |
@@ -786,7 +786,7 @@ static inline int ip6_tnl_xmit_ctl(struct ip6_tnl *t) | |||
786 | struct net_device *ldev = NULL; | 786 | struct net_device *ldev = NULL; |
787 | 787 | ||
788 | if (p->link) | 788 | if (p->link) |
789 | ldev = dev_get_by_index(p->link); | 789 | ldev = dev_get_by_index(&init_net, p->link); |
790 | 790 | ||
791 | if (unlikely(!ipv6_chk_addr(&p->laddr, ldev, 0))) | 791 | if (unlikely(!ipv6_chk_addr(&p->laddr, ldev, 0))) |
792 | printk(KERN_WARNING | 792 | printk(KERN_WARNING |