Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

gro: Fix handling of complete checksums in IPv6

Browse source 
We need to perform skb_postpull_rcsum after pulling the IPv6
header in order to maintain the correctness of the complete
checksum.

This patch also adds a missing iph reload after pulling.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2009-01-17 19:46:16 +00:00 committed by David S. Miller
parent 0d1cfd20cc
commit ebad18e93f
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/ipv6/af_inet6.c
View file

@ -797,6 +797,7 @@ static struct sk_buff **ipv6_gro_receive(struct sk_buff **head,
unsigned int nlen; unsigned int nlen;
int flush = 1; int flush = 1;
int proto; int proto;
__wsum csum;
if (unlikely(!pskb_may_pull(skb, sizeof(*iph)))) if (unlikely(!pskb_may_pull(skb, sizeof(*iph))))
goto out; goto out;
@ -808,6 +809,7 @@ static struct sk_buff **ipv6_gro_receive(struct sk_buff **head,
rcu_read_lock(); rcu_read_lock();
proto = ipv6_gso_pull_exthdrs(skb, iph->nexthdr); proto = ipv6_gso_pull_exthdrs(skb, iph->nexthdr);
iph = ipv6_hdr(skb);
IPV6_GRO_CB(skb)->proto = proto; IPV6_GRO_CB(skb)->proto = proto;
ops = rcu_dereference(inet6_protos[proto]); ops = rcu_dereference(inet6_protos[proto]);
if (!ops || !ops->gro_receive) if (!ops || !ops->gro_receive)
@ -839,8 +841,13 @@ static struct sk_buff **ipv6_gro_receive(struct sk_buff **head,
NAPI_GRO_CB(skb)->flush |= flush; NAPI_GRO_CB(skb)->flush |= flush;
csum = skb->csum;
skb_postpull_rcsum(skb, iph, skb_network_header_len(skb));
pp = ops->gro_receive(head, skb); pp = ops->gro_receive(head, skb);
skb->csum = csum;
out_unlock: out_unlock:
rcu_read_unlock(); rcu_read_unlock();