diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
commit | aba4e552a2f2c1492441acbccedd8e0a4c53f916 (patch) | |
tree | 23921efb2b4af590160f034a89ff3da2ecca6e47 /include/asm-arm/checksum.h | |
parent | 9e17e1aa1cf1cb497d2f67147a51831888affcf3 (diff) |
Merge with Linux 2.3.43.
Diffstat (limited to 'include/asm-arm/checksum.h')
-rw-r--r-- | include/asm-arm/checksum.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/checksum.h b/include/asm-arm/checksum.h index 5e1fb8792..5f1e0f695 100644 --- a/include/asm-arm/checksum.h +++ b/include/asm-arm/checksum.h @@ -148,10 +148,10 @@ __csum_ipv6_magic(struct in6_addr *saddr, struct in6_addr *daddr, __u32 len, __u32 proto, unsigned int sum); extern __inline__ unsigned short int -csum_ipv6_magic(struct in6_addr *saddr, struct in6_addr *daddr, __u16 len, +csum_ipv6_magic(struct in6_addr *saddr, struct in6_addr *daddr, __u32 len, unsigned short proto, unsigned int sum) { - return csum_fold(__csum_ipv6_magic(saddr, daddr, htonl((__u32)len), + return csum_fold(__csum_ipv6_magic(saddr, daddr, htonl(len), htonl(proto), sum)); } #endif |