OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2c4f414
)
ip_tunnel: do not clear l4 hashes
author
Eric Dumazet
<edumazet@google.com>
Thu, 8 Sep 2016 22:40:48 +0000
(15:40 -0700)
committer
David S. Miller
<davem@davemloft.net>
Sat, 10 Sep 2016 02:33:11 +0000
(19:33 -0700)
If skb has a valid l4 hash, there is no point clearing hash and force
a further flow dissection when a tunnel encapsulation is added.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_tunnel_core.c
patch
|
blob
|
history
diff --git
a/net/ipv4/ip_tunnel_core.c
b/net/ipv4/ip_tunnel_core.c
index
0f227db
..
777bc18
100644
(file)
--- a/
net/ipv4/ip_tunnel_core.c
+++ b/
net/ipv4/ip_tunnel_core.c
@@
-69,7
+69,7
@@
void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
skb_scrub_packet(skb, xnet);
- skb_clear_hash(skb);
+ skb_clear_hash
_if_not_l4
(skb);
skb_dst_set(skb, &rt->dst);
memset(IPCB(skb), 0, sizeof(*IPCB(skb)));