diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 12:44:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 12:44:11 -0400 |
| commit | 77a50df2b14c8d3ee3c58c21c4a0e0157570df09 (patch) | |
| tree | 0e324a712e5e768c8353b0b5ba6ddc31095479f0 /net/ipv6/ip6mr.c | |
| parent | 96fffeb4b413a4f8f65bb627d59b7dfc97ea0b39 (diff) | |
| parent | 358c12953b88c5a06a57c33eb27c753b2e7934d1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
iwlwifi: Allow building iwl3945 without iwl4965.
wireless: Fix compile error with wifi & leds
tcp: Fix slab corruption with ipv6 and tcp6fuzz
ipv4/ipv6 compat: Fix SSM applications on 64bit kernels.
[IPSEC]: Use digest_null directly for auth
sunrpc: fix missing kernel-doc
can: Fix copy_from_user() results interpretation
Revert "ipv6: Fix typo in net/ipv6/Kconfig"
tipc: endianness annotations
ipv6: result of csum_fold() is already 16bit, no need to cast
[XFRM] AUDIT: Fix flowlabel text format ambibuity.
Diffstat (limited to 'net/ipv6/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index c8c6e33d1163..2de3c464fe75 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c | |||
| @@ -358,7 +358,7 @@ static int pim6_rcv(struct sk_buff *skb) | |||
| 358 | if (pim->type != ((PIM_VERSION << 4) | PIM_REGISTER) || | 358 | if (pim->type != ((PIM_VERSION << 4) | PIM_REGISTER) || |
| 359 | (pim->flags & PIM_NULL_REGISTER) || | 359 | (pim->flags & PIM_NULL_REGISTER) || |
| 360 | (ip_compute_csum((void *)pim, sizeof(*pim)) != 0 && | 360 | (ip_compute_csum((void *)pim, sizeof(*pim)) != 0 && |
| 361 | (u16)csum_fold(skb_checksum(skb, 0, skb->len, 0)))) | 361 | csum_fold(skb_checksum(skb, 0, skb->len, 0)))) |
| 362 | goto drop; | 362 | goto drop; |
| 363 | 363 | ||
| 364 | /* check if the inner packet is destined to mcast group */ | 364 | /* check if the inner packet is destined to mcast group */ |