aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2014-04-28 02:04:30 +0100
committerBen Hutchings <ben@decadent.org.uk>2014-04-30 16:23:27 +0100
commit53119558f7a2f8e6432e00d395748a431a0cb14e (patch)
tree225cbeb4da82fc6ddc5d3c117831b660f2d009b5
parent3d793c474f42b0443b7d13c851d8960de4485184 (diff)
Revert "alpha: fix broken network checksum"
This reverts commit b93b90ff7c50288d602108ae1a09673df3f799a8, which was commit 0ef38d70d4118b2ce1a538d14357be5ff9dc2bbd upstream. It was intended to fix a regression which never occurred in 3.2.
-rw-r--r--arch/alpha/lib/csum_partial_copy.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c
index 1d2ef5a3fc8..40736da9bea 100644
--- a/arch/alpha/lib/csum_partial_copy.c
+++ b/arch/alpha/lib/csum_partial_copy.c
@@ -373,11 +373,6 @@ csum_partial_copy_from_user(const void __user *src, void *dst, int len,
__wsum
csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
{
- __wsum checksum;
- mm_segment_t oldfs = get_fs();
- set_fs(KERNEL_DS);
- checksum = csum_partial_copy_from_user((__force const void __user *)src,
- dst, len, sum, NULL);
- set_fs(oldfs);
- return checksum;
+ return csum_partial_copy_from_user((__force const void __user *)src,
+ dst, len, sum, NULL);
}