Commit 34079298 authored by David S. Miller's avatar David S. Miller Committed by Juerg Haefliger

Revert "sit: reload iphdr in ipip6_rcv"

BugLink: http://bugs.launchpad.net/bugs/1772775

This reverts commit b699d003.

As per Eric Dumazet, the pskb_may_pull() is a NOP in this
particular case, so the 'iph' reload is unnecessary.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
(cherry picked from commit f4eb17e1)
Signed-off-by: default avatarJoseph Salisbury <joseph.salisbury@canonical.com>
Acked-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarJuerg Haefliger <juergh@canonical.com>
parent 08d1350f
...@@ -692,7 +692,6 @@ static int ipip6_rcv(struct sk_buff *skb) ...@@ -692,7 +692,6 @@ static int ipip6_rcv(struct sk_buff *skb)
if (iptunnel_pull_header(skb, 0, htons(ETH_P_IPV6))) if (iptunnel_pull_header(skb, 0, htons(ETH_P_IPV6)))
goto out; goto out;
iph = ip_hdr(skb);
err = IP_ECN_decapsulate(iph, skb); err = IP_ECN_decapsulate(iph, skb);
if (unlikely(err)) { if (unlikely(err)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment