diff options
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r-- | net/ipv6/sit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index eb20bb690abd..e79f419b1731 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -167,7 +167,7 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int | |||
167 | int i; | 167 | int i; |
168 | for (i=1; i<100; i++) { | 168 | for (i=1; i<100; i++) { |
169 | sprintf(name, "sit%d", i); | 169 | sprintf(name, "sit%d", i); |
170 | if (__dev_get_by_name(name) == NULL) | 170 | if (__dev_get_by_name(&init_net, name) == NULL) |
171 | break; | 171 | break; |
172 | } | 172 | } |
173 | if (i==100) | 173 | if (i==100) |
@@ -761,7 +761,7 @@ static int ipip6_tunnel_init(struct net_device *dev) | |||
761 | } | 761 | } |
762 | 762 | ||
763 | if (!tdev && tunnel->parms.link) | 763 | if (!tdev && tunnel->parms.link) |
764 | tdev = __dev_get_by_index(tunnel->parms.link); | 764 | tdev = __dev_get_by_index(&init_net, tunnel->parms.link); |
765 | 765 | ||
766 | if (tdev) { | 766 | if (tdev) { |
767 | dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr); | 767 | dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr); |