diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-07 23:03:11 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-07 23:03:11 -0500 |
| commit | d5112a4f31a361409d3c57dc9d58dd69f8014bef (patch) | |
| tree | 64771300b2191cb94d9aaf60355661a01c2ccd1a /include/asm-ia64/checksum.h | |
| parent | 12e86f92fcfe4f0bcab0ad7fa4088a64c60d9b38 (diff) | |
| parent | 5fad293bcbd48d9a2370020cf60e4b4a42559b12 (diff) | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.21
Diffstat (limited to 'include/asm-ia64/checksum.h')
| -rw-r--r-- | include/asm-ia64/checksum.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-ia64/checksum.h b/include/asm-ia64/checksum.h index 2b78582cbd61..97af155057e4 100644 --- a/include/asm-ia64/checksum.h +++ b/include/asm-ia64/checksum.h | |||
| @@ -72,8 +72,8 @@ static inline __sum16 csum_fold(__wsum csum) | |||
| 72 | 72 | ||
| 73 | #define _HAVE_ARCH_IPV6_CSUM 1 | 73 | #define _HAVE_ARCH_IPV6_CSUM 1 |
| 74 | struct in6_addr; | 74 | struct in6_addr; |
| 75 | extern unsigned short int csum_ipv6_magic(struct in6_addr *saddr, | 75 | extern __sum16 csum_ipv6_magic(const struct in6_addr *saddr, |
| 76 | struct in6_addr *daddr, __u32 len, unsigned short proto, | 76 | const struct in6_addr *daddr, __u32 len, unsigned short proto, |
| 77 | unsigned int csum); | 77 | __wsum csum); |
| 78 | 78 | ||
| 79 | #endif /* _ASM_IA64_CHECKSUM_H */ | 79 | #endif /* _ASM_IA64_CHECKSUM_H */ |