| From f4eb17e1efe538d4da7d574bedb00a8dafcc26b7 Mon Sep 17 00:00:00 2001 |
| From: "David S. Miller" <davem@davemloft.net> |
| Date: Tue, 6 Jun 2017 11:34:06 -0400 |
| Subject: Revert "sit: reload iphdr in ipip6_rcv" |
| |
| From: David S. Miller <davem@davemloft.net> |
| |
| commit f4eb17e1efe538d4da7d574bedb00a8dafcc26b7 upstream. |
| |
| 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> |
| Cc: Dmitry Tunin <hanipouspilot@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| net/ipv6/sit.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| --- 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)) { |
