diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-02 11:25:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-02 11:25:43 -0700 |
| commit | 739e4a758e0e2930f4bcdddd244254bae8dd7499 (patch) | |
| tree | 0179d038669ad55591ae05a90b210d7090edf56e /net/ipv6/ip6_vti.c | |
| parent | d068b02cfdfc27f5962ec82ec5568b706f599edc (diff) | |
| parent | 50dddff3cb9af328dd42bafe3437c7f47e8b38a9 (diff) | |
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/ipv6/ip6_vti.c')
| -rw-r--r-- | net/ipv6/ip6_vti.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 7f52fd9fa7b0..5833a2244467 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -253,8 +253,12 @@ static struct ip6_tnl *vti6_locate(struct net *net, struct __ip6_tnl_parm *p, (t = rtnl_dereference(*tp)) != NULL; tp = &t->next) { if (ipv6_addr_equal(local, &t->parms.laddr) && - ipv6_addr_equal(remote, &t->parms.raddr)) + ipv6_addr_equal(remote, &t->parms.raddr)) { + if (create) + return NULL; + return t; + } } if (!create) return NULL; |