diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2020-07-11 06:12:07 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2020-08-20 21:45:14 +0200 |
| commit | cc44c17baf7f3f833d36b2f2a1edb1cc0b6f2cc4 (patch) | |
| tree | 78e1d7c77dfd8cc862ba559d4c4c6653a5002c1b /arch/m68k | |
| parent | unify generic instances of csum_partial_copy_nocheck() (diff) | |
| download | linux-cc44c17baf7f3f833d36b2f2a1edb1cc0b6f2cc4.tar.xz linux-cc44c17baf7f3f833d36b2f2a1edb1cc0b6f2cc4.zip | |
csum_partial_copy_nocheck(): drop the last argument
It's always 0. Note that we theoretically could use ~0U as well -
result will be the same modulo 0xffff, _if_ the damn thing did the
right thing for any value of initial sum; later we'll make use of
that when convenient.
However, unlike csum_and_copy_..._user(), there are instances that
did not work for arbitrary initial sums; c6x is one such.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/checksum.h | 3 | ||||
| -rw-r--r-- | arch/m68k/lib/checksum.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/checksum.h b/arch/m68k/include/asm/checksum.h index ab16881d84cb..d5e74c64b6cd 100644 --- a/arch/m68k/include/asm/checksum.h +++ b/arch/m68k/include/asm/checksum.h @@ -38,8 +38,7 @@ extern __wsum csum_and_copy_from_user(const void __user *src, int *csum_err); extern __wsum csum_partial_copy_nocheck(const void *src, - void *dst, int len, - __wsum sum); + void *dst, int len); /* * This is a version of ip_fast_csum() optimized for IP headers, diff --git a/arch/m68k/lib/checksum.c b/arch/m68k/lib/checksum.c index 31797be9a3dc..86ddd2ee187d 100644 --- a/arch/m68k/lib/checksum.c +++ b/arch/m68k/lib/checksum.c @@ -324,9 +324,10 @@ EXPORT_SYMBOL(csum_and_copy_from_user); */ __wsum -csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum) +csum_partial_copy_nocheck(const void *src, void *dst, int len) { unsigned long tmp1, tmp2; + __wsum sum = 0; __asm__("movel %2,%4\n\t" "btst #1,%4\n\t" /* Check alignment */ "jeq 2f\n\t" |