diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
| commit | 51e18a453f5f59a40c721d4aeab082b4e2e9fac6 (patch) | |
| tree | 540d37e6f7a83466677ab6095fcdd2d6f72583c4 /net/ipv6 | |
| parent | macvlan: fix memory hole in macvlan_dev (diff) | |
| parent | kmemcheck: rip it out for real (diff) | |
| download | linux-dev-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.tar.xz linux-dev-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict was two parallel additions of include files to sch_generic.c,
no biggie.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 6a3b1a54a952..6ff2f21ae3fc 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -904,7 +904,7 @@ static int ipxip6_rcv(struct sk_buff *skb, u8 ipproto, if (t->parms.collect_md) { tun_dst = ipv6_tun_rx_dst(skb, 0, 0, 0); if (!tun_dst) - return 0; + goto drop; } ret = __ip6_tnl_rcv(t, skb, tpi, tun_dst, dscp_ecn_decapsulate, log_ecn_error); |