Commit f4eb17e1 authored by David S. Miller's avatar David S. Miller

Revert "sit: reload iphdr in ipip6_rcv"

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>
parent 269f9883
...@@ -657,7 +657,6 @@ static int ipip6_rcv(struct sk_buff *skb) ...@@ -657,7 +657,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),
!net_eq(tunnel->net, dev_net(tunnel->dev)))) !net_eq(tunnel->net, dev_net(tunnel->dev))))
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