diff options
| author | Al Viro | 2006-11-15 06:20:08 +0100 |
|---|---|---|
| committer | David S. Miller | 2006-12-03 06:23:14 +0100 |
| commit | a4f89fb7c072b8592b296c2ba216269c0c96db43 (patch) | |
| tree | 81ed700573ed0bcf23b99e82ae0b538ac16e62e9 /arch/x86_64/lib/csum-partial.c | |
| parent | [NET]: V850 checksum annotations and cleanups. (diff) | |
| download | kernel-qcow2-linux-a4f89fb7c072b8592b296c2ba216269c0c96db43.tar.gz kernel-qcow2-linux-a4f89fb7c072b8592b296c2ba216269c0c96db43.tar.xz kernel-qcow2-linux-a4f89fb7c072b8592b296c2ba216269c0c96db43.zip | |
[NET]: X86_64 checksum annotations and cleanups.
* sanitize prototypes, annotate
* usual ntohs->shift
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86_64/lib/csum-partial.c')
| -rw-r--r-- | arch/x86_64/lib/csum-partial.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86_64/lib/csum-partial.c b/arch/x86_64/lib/csum-partial.c index c493735218da..06ae630de82b 100644 --- a/arch/x86_64/lib/csum-partial.c +++ b/arch/x86_64/lib/csum-partial.c @@ -132,9 +132,10 @@ static __force_inline unsigned do_csum(const unsigned char *buff, unsigned len) * * it's best to have buff aligned on a 64-bit boundary */ -unsigned csum_partial(const unsigned char *buff, unsigned len, unsigned sum) +__wsum csum_partial(const void *buff, int len, __wsum sum) { - return add32_with_carry(do_csum(buff, len), sum); + return (__force __wsum)add32_with_carry(do_csum(buff, len), + (__force u32)sum); } EXPORT_SYMBOL(csum_partial); @@ -143,7 +144,7 @@ EXPORT_SYMBOL(csum_partial); * this routine is used for miscellaneous IP-like checksums, mainly * in icmp.c */ -unsigned short ip_compute_csum(unsigned char * buff, int len) +__sum16 ip_compute_csum(const void *buff, int len) { return csum_fold(csum_partial(buff,len,0)); } |