fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / core / iovec.c

diff --git a/net/core/iovec.c b/net/core/iovec.c
index d57ace9..04b249c 100644 (file)
--- a/net/core/iovec.c
+++ b/net/core/iovec.c
@@ -33,7 +33,7 @@
  *     Verify iovec. The caller must ensure that the iovec is big enough
  *     to hold the message iovec.
  *
- *     Save time not doing verify_area. copy_*_user will make this work
+ *     Save time not doing access_ok. copy_*_user will make this work
  *     in any case.
  */
 
@@ -158,9 +158,9 @@ int memcpy_fromiovecend(unsigned char *kdata, struct iovec *iov, int offset,
  *     call to this function will be unaligned also.
  */
 int csum_partial_copy_fromiovecend(unsigned char *kdata, struct iovec *iov,
-                                int offset, unsigned int len, int *csump)
+                                int offset, unsigned int len, __wsum *csump)
 {
-       int csum = *csump;
+       __wsum csum = *csump;
        int partial_cnt = 0, err = 0;
 
        /* Skip over the finished iovecs */