git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
m68k
/
lib
/
checksum.c
diff --git
a/arch/m68k/lib/checksum.c
b/arch/m68k/lib/checksum.c
index
484ba8b
..
aed3be2
100644
(file)
--- a/
arch/m68k/lib/checksum.c
+++ b/
arch/m68k/lib/checksum.c
@@
-39,8
+39,7
@@
* computes a partial checksum, e.g. for TCP/UDP fragments
*/
* computes a partial checksum, e.g. for TCP/UDP fragments
*/
-unsigned int
-csum_partial (const unsigned char *buff, int len, unsigned int sum)
+__wsum csum_partial(const void *buff, int len, __wsum sum)
{
unsigned long tmp1, tmp2;
/*
{
unsigned long tmp1, tmp2;
/*
@@
-133,9
+132,9
@@
EXPORT_SYMBOL(csum_partial);
* copy from user space while checksumming, with exception handling.
*/
* copy from user space while checksumming, with exception handling.
*/
-unsigned int
-csum_partial_copy_from_user(const
char *src, char *dst, int len
,
- int sum, int *csum_err)
+__wsum
+csum_partial_copy_from_user(const
void __user *src, void *dst
,
+ int
len, __wsum
sum, int *csum_err)
{
/*
* GCC doesn't like more than 10 operands for the asm
{
/*
* GCC doesn't like more than 10 operands for the asm
@@
-325,8
+324,8
@@
csum_partial_copy_from_user(const char *src, char *dst, int len,
* copy from kernel space while checksumming, otherwise like csum_partial
*/
* copy from kernel space while checksumming, otherwise like csum_partial
*/
-unsigned int
-csum_partial_copy_nocheck(const
char *src, char *dst, int len, int
sum)
+__wsum
+csum_partial_copy_nocheck(const
void *src, void *dst, int len, __wsum
sum)
{
unsigned long tmp1, tmp2;
__asm__("movel %2,%4\n\t"
{
unsigned long tmp1, tmp2;
__asm__("movel %2,%4\n\t"