diff options
Diffstat (limited to 'net/ipv4/ip_gre.c')
-rw-r--r-- | net/ipv4/ip_gre.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 5c14ed63e56c..3106225c5e50 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
@@ -262,7 +262,7 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, int | |||
262 | int i; | 262 | int i; |
263 | for (i=1; i<100; i++) { | 263 | for (i=1; i<100; i++) { |
264 | sprintf(name, "gre%d", i); | 264 | sprintf(name, "gre%d", i); |
265 | if (__dev_get_by_name(name) == NULL) | 265 | if (__dev_get_by_name(&init_net, name) == NULL) |
266 | break; | 266 | break; |
267 | } | 267 | } |
268 | if (i==100) | 268 | if (i==100) |
@@ -1196,7 +1196,7 @@ static int ipgre_tunnel_init(struct net_device *dev) | |||
1196 | } | 1196 | } |
1197 | 1197 | ||
1198 | if (!tdev && tunnel->parms.link) | 1198 | if (!tdev && tunnel->parms.link) |
1199 | tdev = __dev_get_by_index(tunnel->parms.link); | 1199 | tdev = __dev_get_by_index(&init_net, tunnel->parms.link); |
1200 | 1200 | ||
1201 | if (tdev) { | 1201 | if (tdev) { |
1202 | hlen = tdev->hard_header_len; | 1202 | hlen = tdev->hard_header_len; |