projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'xfs-for-linus-v3.14-rc1-2' of git://oss.sgi.com/xfs/xfs
[cascardo/linux.git]
/
net
/
ipv6
/
tcpv6_offload.c
diff --git
a/net/ipv6/tcpv6_offload.c
b/net/ipv6/tcpv6_offload.c
index
6d18157
..
0d78132
100644
(file)
--- a/
net/ipv6/tcpv6_offload.c
+++ b/
net/ipv6/tcpv6_offload.c
@@
-66,13
+66,13
@@
skip_csum:
return tcp_gro_receive(head, skb);
}
return tcp_gro_receive(head, skb);
}
-static int tcp6_gro_complete(struct sk_buff *skb)
+static int tcp6_gro_complete(struct sk_buff *skb
, int thoff
)
{
const struct ipv6hdr *iph = ipv6_hdr(skb);
struct tcphdr *th = tcp_hdr(skb);
{
const struct ipv6hdr *iph = ipv6_hdr(skb);
struct tcphdr *th = tcp_hdr(skb);
- th->check = ~tcp_v6_check(skb->len -
skb_transport_offset(skb)
,
- &iph->
saddr, &iph->
daddr, 0);
+ th->check = ~tcp_v6_check(skb->len -
thoff, &iph->saddr
,
+ &iph->daddr, 0);
skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
return tcp_gro_complete(skb);
skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
return tcp_gro_complete(skb);