upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / include / net / checksum.h

diff --git a/include/net/checksum.h b/include/net/checksum.h
index 43f4023..e3ea7cc 100644 (file)
--- a/include/net/checksum.h
+++ b/include/net/checksum.h
@@ -27,10 +27,10 @@
 
 #ifndef _HAVE_ARCH_COPY_AND_CSUM_FROM_USER
 static inline
-unsigned int csum_and_copy_from_user (const char __user *src, char *dst,
+unsigned int csum_and_copy_from_user (const unsigned char __user *src, unsigned char *dst,
                                      int len, int sum, int *err_ptr)
 {
-       if (verify_area(VERIFY_READ, src, len) == 0)
+       if (access_ok(VERIFY_READ, src, len))
                return csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
 
        if (len)
@@ -42,7 +42,7 @@ unsigned int csum_and_copy_from_user (const char __user *src, char *dst,
 
 #ifndef HAVE_CSUM_COPY_USER
 static __inline__ unsigned int csum_and_copy_to_user
-(const char *src, char __user *dst, int len, unsigned int sum, int *err_ptr)
+(const unsigned char *src, unsigned char __user *dst, int len, unsigned int sum, int *err_ptr)
 {
        sum = csum_partial(src, len, sum);