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-sparc64/checksum.h | |
| parent | 9e17e1aa1cf1cb497d2f67147a51831888affcf3 (diff) | |
Merge with Linux 2.3.43.
Diffstat (limited to 'include/asm-sparc64/checksum.h')
| -rw-r--r-- | include/asm-sparc64/checksum.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-sparc64/checksum.h b/include/asm-sparc64/checksum.h index b2c06823a..11748508e 100644 --- a/include/asm-sparc64/checksum.h +++ b/include/asm-sparc64/checksum.h @@ -1,4 +1,4 @@ -/* $Id: checksum.h,v 1.15 2000/01/19 04:06:09 davem Exp $ */ +/* $Id: checksum.h,v 1.16 2000/01/31 01:26:54 davem Exp $ */ #ifndef __SPARC64_CHECKSUM_H #define __SPARC64_CHECKSUM_H @@ -167,7 +167,7 @@ static inline unsigned short int csum_tcpudp_magic(unsigned long saddr, 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) { @@ -192,7 +192,7 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr, addccc %%g3, %%g7, %0 addc 0, %0, %0 " : "=&r" (sum) - : "r" (saddr), "r" (daddr), "r"(htonl((__u32) (len))), + : "r" (saddr), "r" (daddr), "r"(htonl(len)), "r"(htonl(proto)), "r"(sum) : "g2", "g3", "g7", "cc"); |