diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-14 21:16:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:23:06 -0800 |
| commit | 85d20dee20f0958df1615e73698f6b0c525812f7 (patch) | |
| tree | 47ddcace761e2c26da0dafc437cef5a2ec852183 /arch/m32r | |
| parent | 322529961e3b3e64fdf1a3e46a45294456c91acf (diff) | |
| download | linux-3.10-85d20dee20f0958df1615e73698f6b0c525812f7.tar.gz linux-3.10-85d20dee20f0958df1615e73698f6b0c525812f7.tar.bz2 linux-3.10-85d20dee20f0958df1615e73698f6b0c525812f7.zip | |
[NET]: M32R checksum annotations and cleanups.
* sanitize prototypes, annotate
* ntohs -> shift in checksum calculations in l-e case
* kill shift-by-16 in checksum calculations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | arch/m32r/lib/csum_partial_copy.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/m32r/lib/csum_partial_copy.c b/arch/m32r/lib/csum_partial_copy.c index 3d5f0614585..5596f3df833 100644 --- a/arch/m32r/lib/csum_partial_copy.c +++ b/arch/m32r/lib/csum_partial_copy.c @@ -27,9 +27,8 @@ /* * Copy while checksumming, otherwise like csum_partial */ -unsigned int -csum_partial_copy_nocheck (const unsigned char *src, unsigned char *dst, - int len, unsigned int sum) +__wsum +csum_partial_copy_nocheck (const void *src, void *dst, int len, __wsum sum) { sum = csum_partial(src, len, sum); memcpy(dst, src, len); @@ -42,10 +41,9 @@ EXPORT_SYMBOL(csum_partial_copy_nocheck); * Copy from userspace and compute checksum. If we catch an exception * then zero the rest of the buffer. */ -unsigned int -csum_partial_copy_from_user (const unsigned char __user *src, - unsigned char *dst, - int len, unsigned int sum, int *err_ptr) +__wsum +csum_partial_copy_from_user (const void __user *src, void *dst, + int len, __wsum sum, int *err_ptr) { int missing; |