projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
269f988
)
Revert "sit: reload iphdr in ipip6_rcv"
author
David S. Miller
<davem@davemloft.net>
Tue, 6 Jun 2017 15:34:06 +0000
(11:34 -0400)
committer
David S. Miller
<davem@davemloft.net>
Tue, 6 Jun 2017 15:34:06 +0000
(11:34 -0400)
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>
net/ipv6/sit.c
patch
|
blob
|
history
diff --git
a/net/ipv6/sit.c
b/net/ipv6/sit.c
index
af832e7
..
61e5902
100644
(file)
--- 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)) {