iov_iter, net: Fold in csum_and_memcpy()

[linux-2.6-microblaze.git] / net / core / datagram.c

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 37c89d0..452620d 100644 (file)
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -732,8 +732,9 @@ size_t memcpy_to_iter_csum(void *iter_to, size_t progress,
                           size_t len, void *from, void *priv2)
 {
        __wsum *csum = priv2;
+       __wsum next = csum_partial_copy_nocheck(from, iter_to, len);
 
-       *csum = csum_and_memcpy(iter_to, from + progress, len, *csum, progress);
+       *csum = csum_block_add(*csum, next, progress);
        return 0;
 }