diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-02 20:25:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-02 20:25:43 +0200 |
| commit | 739e4a758e0e2930f4bcdddd244254bae8dd7499 (patch) | |
| tree | 0179d038669ad55591ae05a90b210d7090edf56e /net/ipv4/ip_tunnel.c | |
| parent | net: phy: add BCM7425 and BCM7429 PHYs (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-739e4a758e0e2930f4bcdddd244254bae8dd7499.tar.xz linux-739e4a758e0e2930f4bcdddd244254bae8dd7499.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/r8152.c
net/netfilter/nfnetlink.c
Both r8152 and nfnetlink conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel.c')
| -rw-r--r-- | net/ipv4/ip_tunnel.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index b75b47b0a223..2272de90c2d4 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -853,9 +853,14 @@ int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd) t = ip_tunnel_find(itn, p, itn->fb_tunnel_dev->type); - if (!t && (cmd == SIOCADDTUNNEL)) { - t = ip_tunnel_create(net, itn, p); - err = PTR_ERR_OR_ZERO(t); + if (cmd == SIOCADDTUNNEL) { + if (!t) { + t = ip_tunnel_create(net, itn, p); + err = PTR_ERR_OR_ZERO(t); + break; + } + + err = -EEXIST; break; } if (dev != itn->fb_tunnel_dev && cmd == SIOCCHGTUNNEL) { |