[IP_TUNNEL]: Don't limit the number of tunnels with generic name explicitly.
Use the added dev_alloc_name() call to create tunnel device name, rather than iterate in a hand-made loop with an artificial limit. Thanks Patrick for noticing this. [ The way this works is, when the device is actually registered, the generic code noticed the '%' in the name and invokes dev_alloc_name() to fully resolve the name. -DaveM ] Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
55b01e8681
commit
34cc7ba639
@ -221,16 +221,8 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int c
|
||||
|
||||
if (parms->name[0])
|
||||
strlcpy(name, parms->name, IFNAMSIZ);
|
||||
else {
|
||||
int i;
|
||||
for (i=1; i<100; i++) {
|
||||
sprintf(name, "tunl%d", i);
|
||||
if (__dev_get_by_name(&init_net, name) == NULL)
|
||||
break;
|
||||
}
|
||||
if (i==100)
|
||||
goto failed;
|
||||
}
|
||||
else
|
||||
sprintf(name, "tunl%%d");
|
||||
|
||||
dev = alloc_netdev(sizeof(*t), name, ipip_tunnel_setup);
|
||||
if (dev == NULL)
|
||||
|
Reference in New Issue
Block a user