diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-12-15 01:27:23 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-12-15 01:27:23 +0100 |
| commit | 4b4193256c8d3bc3a5397b5cd9494c2ad386317d (patch) | |
| tree | b6b070f8893384b5d563fc616018e7d5644b2ece /arch/nios2/include/asm/checksum.h | |
| parent | Input: goodix - add upside-down quirk for Teclast X98 Pro tablet (diff) | |
| parent | Input: da7280 - fix spelling mistake "sequemce" -> "sequence" (diff) | |
| download | linux-4b4193256c8d3bc3a5397b5cd9494c2ad386317d.tar.xz linux-4b4193256c8d3bc3a5397b5cd9494c2ad386317d.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 5.11 merge window.
Diffstat (limited to 'arch/nios2/include/asm/checksum.h')
| -rw-r--r-- | arch/nios2/include/asm/checksum.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/nios2/include/asm/checksum.h b/arch/nios2/include/asm/checksum.h index 703c5ee63421..b4316c361729 100644 --- a/arch/nios2/include/asm/checksum.h +++ b/arch/nios2/include/asm/checksum.h @@ -12,12 +12,9 @@ /* Take these from lib/checksum.c */ extern __wsum csum_partial(const void *buff, int len, __wsum sum); -extern __wsum csum_partial_copy(const void *src, void *dst, int len, +__wsum csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum); -extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst, - int len, __wsum sum, int *csum_err); -#define csum_partial_copy_nocheck(src, dst, len, sum) \ - csum_partial_copy((src), (dst), (len), (sum)) +#define csum_partial_copy_nocheck csum_partial_copy_nocheck extern __sum16 ip_fast_csum(const void *iph, unsigned int ihl); extern __sum16 ip_compute_csum(const void *buff, int len); |