diff options
Diffstat (limited to 'net/ipv4/ipip.c')
-rw-r--r-- | net/ipv4/ipip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 396437242a1..652bd86e33a 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
@@ -225,7 +225,7 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int c | |||
225 | int i; | 225 | int i; |
226 | for (i=1; i<100; i++) { | 226 | for (i=1; i<100; i++) { |
227 | sprintf(name, "tunl%d", i); | 227 | sprintf(name, "tunl%d", i); |
228 | if (__dev_get_by_name(name) == NULL) | 228 | if (__dev_get_by_name(&init_net, name) == NULL) |
229 | break; | 229 | break; |
230 | } | 230 | } |
231 | if (i==100) | 231 | if (i==100) |
@@ -822,7 +822,7 @@ static int ipip_tunnel_init(struct net_device *dev) | |||
822 | } | 822 | } |
823 | 823 | ||
824 | if (!tdev && tunnel->parms.link) | 824 | if (!tdev && tunnel->parms.link) |
825 | tdev = __dev_get_by_index(tunnel->parms.link); | 825 | tdev = __dev_get_by_index(&init_net, tunnel->parms.link); |
826 | 826 | ||
827 | if (tdev) { | 827 | if (tdev) { |
828 | dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr); | 828 | dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr); |