diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-05-10 16:08:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-12 01:23:55 +0200 |
| commit | ca4aa976f04d14bc7da60dce0e2afc34c9f0f1d2 (patch) | |
| tree | ee23113458cbe0c80a15fd001c47ff753c5a9107 /net/ipv6 | |
| parent | tcp: replace cnt & rtt with struct in pkts_acked() (diff) | |
| download | linux-ca4aa976f04d14bc7da60dce0e2afc34c9f0f1d2.tar.xz linux-ca4aa976f04d14bc7da60dce0e2afc34c9f0f1d2.zip | |
ipv6: fix 4in6 tunnel receive path
Protocol for 4in6 tunnel is IPPROTO_IPIP. This was wrongly changed by
the last cleanup.
CC: Tom Herbert <tom@herbertland.com>
Fixes: 0d3c703a9d17 ("ipv6: Cleanup IPv6 tunnel receive path")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
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 50af7061ecdb..e79330f214bd 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -897,7 +897,7 @@ drop: static int ip4ip6_rcv(struct sk_buff *skb) { - return ipxip6_rcv(skb, IPPROTO_IP, &tpi_v4, + return ipxip6_rcv(skb, IPPROTO_IPIP, &tpi_v4, ip4ip6_dscp_ecn_decapsulate); } |