Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34cc7ba6 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55b01e86

include/net/ip6_tunnel.h

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
/* capable of receiving packets */

#define IP6_TNL_F_CAP_RCV 0x20000



#define IP6_TNL_MAX 128



/* IPv6 tunnel */



struct ip6_tnl {

net/ipv4/ip_gre.c

+2 −10
Original line number Diff line number Diff line
@@ -259,16 +259,8 @@ static struct ip_tunnel * ipgre_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, "gre%d", i);

			if (__dev_get_by_name(&init_net, name) == NULL)

				break;

		}

		if (i==100)

			goto failed;

	}

	else

		sprintf(name, "gre%%d");



	dev = alloc_netdev(sizeof(*t), name, ipgre_tunnel_setup);

	if (!dev)

net/ipv4/ipip.c

+2 −10
Original line number Diff line number Diff line
@@ -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)

net/ipv6/ip6_tunnel.c

+4 −11
Original line number Diff line number Diff line
@@ -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;

net/ipv6/sit.c

+2 −10
Original line number Diff line number Diff line
@@ -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)