summaryrefslogtreecommitdiffstats
path: root/include/asm-i386
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-18 22:06:10 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-18 22:06:10 +0000
commitaba4e552a2f2c1492441acbccedd8e0a4c53f916 (patch)
tree23921efb2b4af590160f034a89ff3da2ecca6e47 /include/asm-i386
parent9e17e1aa1cf1cb497d2f67147a51831888affcf3 (diff)
Merge with Linux 2.3.43.
Diffstat (limited to 'include/asm-i386')
-rw-r--r--include/asm-i386/checksum.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/checksum.h b/include/asm-i386/checksum.h
index 6cd9c0992..b5085f376 100644
--- a/include/asm-i386/checksum.h
+++ b/include/asm-i386/checksum.h
@@ -154,7 +154,7 @@ static inline unsigned short ip_compute_csum(unsigned char * buff, int len) {
#define _HAVE_ARCH_IPV6_CSUM
static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
struct in6_addr *daddr,
- __u16 len,
+ __u32 len,
unsigned short proto,
unsigned int sum)
{
@@ -173,7 +173,7 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
"
: "=&r" (sum)
: "r" (saddr), "r" (daddr),
- "r"(htonl((__u32) (len))), "r"(htonl(proto)), "0"(sum));
+ "r"(htonl(len)), "r"(htonl(proto)), "0"(sum));
return csum_fold(sum);
}