diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-17 11:21:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-17 11:21:00 -0400 |
| commit | ade6648b3b11a5d81f6f28135193ab6d85d621db (patch) | |
| tree | 1977975176717950d6389f41cc92832111e175ae /net/ipv6/raw.c | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
| parent | fad87acaea7b0965fe91f0351fdd688fc9761cbe (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/raw.c')
| -rw-r--r-- | net/ipv6/raw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index e2b848ec9851..1d4d75b34d32 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
| @@ -328,6 +328,8 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb) | |||
| 328 | 328 | ||
| 329 | if (skb->ip_summed != CHECKSUM_UNNECESSARY) { | 329 | if (skb->ip_summed != CHECKSUM_UNNECESSARY) { |
| 330 | if (skb->ip_summed == CHECKSUM_HW) { | 330 | if (skb->ip_summed == CHECKSUM_HW) { |
| 331 | skb_postpull_rcsum(skb, skb->nh.raw, | ||
| 332 | skb->h.raw - skb->nh.raw); | ||
| 331 | skb->ip_summed = CHECKSUM_UNNECESSARY; | 333 | skb->ip_summed = CHECKSUM_UNNECESSARY; |
| 332 | if (csum_ipv6_magic(&skb->nh.ipv6h->saddr, | 334 | if (csum_ipv6_magic(&skb->nh.ipv6h->saddr, |
| 333 | &skb->nh.ipv6h->daddr, | 335 | &skb->nh.ipv6h->daddr, |