Commit ee30ef4d authored May 15, 2014 by Duan Jiong Committed by David S. Miller May 16, 2014

ip_tunnel: don't add tunnel twice



When using command "ip tunnel add" to add a tunnel, the tunnel will be added twice,
through ip_tunnel_create() and ip_tunnel_update().

Because the second is unnecessary, so we can just break after adding tunnel
through ip_tunnel_create().

Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9bb1a208

net/ipv4/ip_tunnel.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -754,11 +754,9 @@ int ip_tunnel_ioctl(struct net_device dev, struct ip_tunnel_parm p, int cmd)

		if (!t && (cmd == SIOCADDTUNNEL)) {
		t = ip_tunnel_create(net, itn, p);
		if (IS_ERR(t)) {
		err = PTR_ERR(t);
		err = PTR_ERR_OR_ZERO(t);
		break;
		}
		}
		if (dev != itn->fb_tunnel_dev && cmd == SIOCCHGTUNNEL) {
		if (t != NULL) {
		if (t->dev != dev) {