[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>

2 files changed, 6 insertions, 21 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;
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index e77239d02bf5..dde7801abeff 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -164,16 +164,8 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int
 
         if (parms->name[0])
                 strlcpy(name, parms->name, IFNAMSIZ);
-        else {
-                int i;
-                for (i=1; i<100; i++) {
-                        sprintf(name, "sit%d", i);
-                        if (__dev_get_by_name(&init_net, name) == NULL)
-                                break;
-                }
-                if (i==100)
-                        goto failed;
-        }
+        else
+                sprintf(name, "sit%%d");
 
         dev = alloc_netdev(sizeof(*t), name, ipip6_tunnel_setup);
         if (dev == NULL)