diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-23 16:49:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-23 16:49:59 +0100 |
| commit | a9c613d774e602d7c008acb374cb2185b5be2ee4 (patch) | |
| tree | e4c81d684d9cb0518179aac4df64ed5eb497755f /net/ipv6/sit.c | |
| parent | 5b49d48e6165b258428c871a8fc6a09cf75fdb0a (diff) | |
| parent | 1c6a1d5ae62dbaec8922761f56332e6e830b32a4 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-18.09-androidlsk-v4.4-18.07-android
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index dec4e7bda5f3..11282ffca567 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -692,7 +692,6 @@ static int ipip6_rcv(struct sk_buff *skb) if (iptunnel_pull_header(skb, 0, htons(ETH_P_IPV6))) goto out; - iph = ip_hdr(skb); err = IP_ECN_decapsulate(iph, skb); if (unlikely(err)) { |