From: David S. Miller <davem@davemloft.net>
Date: Tue, 6 Jun 2017 15:34:06 +0000 (-0400)
Subject: Revert "sit: reload iphdr in ipip6_rcv"
X-Git-Tag: v6.6-pxa1908~16544^2~9
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=f4eb17e1efe538d4da7d574bedb00a8dafcc26b7;p=linux.git

Revert "sit: reload iphdr in ipip6_rcv"

This reverts commit b699d0035836f6712917a41e7ae58d84359b8ff9.

As per Eric Dumazet, the pskb_may_pull() is a NOP in this
particular case, so the 'iph' reload is unnecessary.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index af832e7ce80f..61e5902f0687 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -657,7 +657,6 @@ static int ipip6_rcv(struct sk_buff *skb)
 		if (iptunnel_pull_header(skb, 0, htons(ETH_P_IPV6),
 		    !net_eq(tunnel->net, dev_net(tunnel->dev))))
 			goto out;
-		iph = ip_hdr(skb);
 
 		err = IP_ECN_decapsulate(iph, skb);
 		if (unlikely(err)) {