diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-06-06 11:34:06 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-06 11:34:06 -0400 |
| commit | f4eb17e1efe538d4da7d574bedb00a8dafcc26b7 (patch) | |
| tree | adce587189b3097c69a08af4e4ea7e14babb0654 /net/ipv6/sit.c | |
| parent | net/mlx4: Check if Granular QoS per VF has been enabled before updating QP qos_vport (diff) | |
| download | linux-dev-f4eb17e1efe538d4da7d574bedb00a8dafcc26b7.tar.xz linux-dev-f4eb17e1efe538d4da7d574bedb00a8dafcc26b7.zip | |
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>
Diffstat (limited to '')
| -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 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)) { |