projects
/
sdk
/
emulator
/
emulator-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3242c9e
)
ipv6: gre: support SIT encapsulation
author
Eric Dumazet
<edumazet@google.com>
Sat, 24 Oct 2015 12:47:44 +0000
(
05:47
-0700)
committer
David S. Miller
<davem@davemloft.net>
Tue, 27 Oct 2015 05:01:18 +0000
(22:01 -0700)
gre_gso_segment() chokes if SIT frames were aggregated by GRO engine.
Fixes:
61c1db7fae21e
("ipv6: sit: add GSO/TSO support")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/gre_offload.c
patch
|
blob
|
history
diff --git
a/net/ipv4/gre_offload.c
b/net/ipv4/gre_offload.c
index
5aa46d4
..
5a8ee32
100644
(file)
--- a/
net/ipv4/gre_offload.c
+++ b/
net/ipv4/gre_offload.c
@@
-36,7
+36,8
@@
static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
SKB_GSO_TCP_ECN |
SKB_GSO_GRE |
SKB_GSO_GRE_CSUM |
- SKB_GSO_IPIP)))
+ SKB_GSO_IPIP |
+ SKB_GSO_SIT)))
goto out;
if (!skb->encapsulation)