diff options
| author |   Pavel Emelyanov <xemul@openvz.org> | 2008-02-23 20:19:20 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-02-23 20:19:20 -0800 |
| commit | 34cc7ba6398203aab4056917fa1e2aa5988487aa (patch) | |
| tree | 40fc152c1d9722ca70154bd6d989694fff526280 /net/ipv6/ip6_tunnel.c | |
| parent | [NET]: Restore sanity wrt. print_mac(). (diff) | |
| download | linux-dev-34cc7ba6398203aab4056917fa1e2aa5988487aa.tar.xz linux-dev-34cc7ba6398203aab4056917fa1e2aa5988487aa.zip | |
[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>
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index cd940647bd12..2a124e9a1b2d 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -229,18 +229,11 @@ static struct ip6_tnl *ip6_tnl_create(struct ip6_tnl_parm *p) char name[IFNAMSIZ]; int err; - if (p->name[0]) { + if (p->name[0]) strlcpy(name, p->name, IFNAMSIZ); - } else { - int i; - for (i = 1; i < IP6_TNL_MAX; i++) { - sprintf(name, "ip6tnl%d", i); - if (__dev_get_by_name(&init_net, name) == NULL) - break; - } - if (i == IP6_TNL_MAX) - goto failed; - } + else + sprintf(name, "ip6tnl%%d"); + dev = alloc_netdev(sizeof (*t), name, ip6_tnl_dev_setup); if (dev == NULL) goto failed; |