projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
net
/
ipv4
/
tcp_offload.c
diff --git
a/net/ipv4/tcp_offload.c
b/net/ipv4/tcp_offload.c
index
4e86c59
..
55046ec
100644
(file)
--- a/
net/ipv4/tcp_offload.c
+++ b/
net/ipv4/tcp_offload.c
@@
-309,7
+309,7
@@
static int tcp4_gro_complete(struct sk_buff *skb, int thoff)
th->check = ~tcp_v4_check(skb->len - thoff, iph->saddr,
iph->daddr, 0);
- skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;
+ skb_shinfo(skb)->gso_type
|
= SKB_GSO_TCPV4;
return tcp_gro_complete(skb);
}