4e57b68178
I recently picked up my older work to remove unnecessary #includes of sched.h, starting from a patch by Dave Jones to not include sched.h from module.h. This reduces the number of indirect includes of sched.h by ~300. Another ~400 pointless direct includes can be removed after this disentangling (patch to follow later). However, quite a few indirect includes need to be fixed up for this. In order to feed the patches through -mm with as little disturbance as possible, I've split out the fixes I accumulated up to now (complete for i386 and x86_64, more archs to follow later) and post them before the real patch. This way this large part of the patch is kept simple with only adding #includes, and all hunks are independent of each other. So if any hunk rejects or gets in the way of other patches, just drop it. My scripts will pick it up again in the next round. Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
62 lines
1.6 KiB
C
62 lines
1.6 KiB
C
/*
|
|
* INET An implementation of the TCP/IP protocol suite for the LINUX
|
|
* operating system. INET is implemented using the BSD Socket
|
|
* interface as the means of communication with the user level.
|
|
*
|
|
* M32R specific IP/TCP/UDP checksumming routines
|
|
* (Some code taken from MIPS architecture)
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 1994, 1995 Waldorf Electronics GmbH
|
|
* Copyright (C) 1998, 1999 Ralf Baechle
|
|
* Copyright (C) 2001-2005 Hiroyuki Kondo, Hirokazu Takata
|
|
*
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/types.h>
|
|
#include <linux/string.h>
|
|
|
|
#include <net/checksum.h>
|
|
#include <asm/byteorder.h>
|
|
#include <asm/uaccess.h>
|
|
|
|
/*
|
|
* Copy while checksumming, otherwise like csum_partial
|
|
*/
|
|
unsigned int
|
|
csum_partial_copy_nocheck (const unsigned char *src, unsigned char *dst,
|
|
int len, unsigned int sum)
|
|
{
|
|
sum = csum_partial(src, len, sum);
|
|
memcpy(dst, src, len);
|
|
|
|
return sum;
|
|
}
|
|
EXPORT_SYMBOL(csum_partial_copy_nocheck);
|
|
|
|
/*
|
|
* Copy from userspace and compute checksum. If we catch an exception
|
|
* then zero the rest of the buffer.
|
|
*/
|
|
unsigned int
|
|
csum_partial_copy_from_user (const unsigned char __user *src,
|
|
unsigned char *dst,
|
|
int len, unsigned int sum, int *err_ptr)
|
|
{
|
|
int missing;
|
|
|
|
missing = copy_from_user(dst, src, len);
|
|
if (missing) {
|
|
memset(dst + len - missing, 0, missing);
|
|
*err_ptr = -EFAULT;
|
|
}
|
|
|
|
return csum_partial(dst, len-missing, sum);
|
|
}
|
|
EXPORT_SYMBOL(csum_partial_copy_from_user);
|
|
EXPORT_SYMBOL(csum_partial);
|