evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ip_tunnel: don't add tunnel twice

Browse source 
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>
This commit is contained in:
Duan Jiong 2014-05-15 13:07:02 +08:00 • committed by David S. Miller
parent 9bb1a208fd
commit ee30ef4d45
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/ipv4/ip_tunnel.c
View file

@ -754,10 +754,8 @@ int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd)
if (!t && (cmd == SIOCADDTUNNEL)) { if (!t && (cmd == SIOCADDTUNNEL)) {
t = ip_tunnel_create(net, itn, p); t = ip_tunnel_create(net, itn, p);
if (IS_ERR(t)) { err = PTR_ERR_OR_ZERO(t);
err = PTR_ERR(t); break;
break;
}
} }
if (dev != itn->fb_tunnel_dev && cmd == SIOCCHGTUNNEL) { if (dev != itn->fb_tunnel_dev && cmd == SIOCCHGTUNNEL) {
if (t != NULL) { if (t != NULL) {