git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
asm-sh
/
checksum.h
diff --git
a/include/asm-sh/checksum.h
b/include/asm-sh/checksum.h
index
512ffe6
..
5113c7f
100644
(file)
--- a/
include/asm-sh/checksum.h
+++ b/
include/asm-sh/checksum.h
@@
-10,6
+10,7
@@
*/
#include <linux/config.h>
*/
#include <linux/config.h>
+#include <linux/in6.h>
/*
* computes the checksum of a memory block at buff, length len,
/*
* computes the checksum of a memory block at buff, length len,
@@
-33,8
+34,8
@@
asmlinkage unsigned int csum_partial(const unsigned char * buff, int len, unsign
* better 64-bit) boundary
*/
* better 64-bit) boundary
*/
-asmlinkage unsigned int csum_partial_copy_generic(
const char *src, char *dst, int len, int sum
,
- int *src_err_ptr, int *dst_err_ptr);
+asmlinkage unsigned int csum_partial_copy_generic(
const unsigned char *src, unsigned char *dst
,
+
int len, int sum,
int *src_err_ptr, int *dst_err_ptr);
/*
* Note: when you get a NULL pointer exception here this means someone
/*
* Note: when you get a NULL pointer exception here this means someone
@@
-44,14
+45,14
@@
asmlinkage unsigned int csum_partial_copy_generic( const char *src, char *dst, i
* verify_area().
*/
static __inline__
* verify_area().
*/
static __inline__
-unsigned int csum_partial_copy_nocheck (
const char *src,
char *dst,
+unsigned int csum_partial_copy_nocheck (
const unsigned char *src, unsigned
char *dst,
int len, int sum)
{
return csum_partial_copy_generic ( src, dst, len, sum, NULL, NULL);
}
static __inline__
int len, int sum)
{
return csum_partial_copy_generic ( src, dst, len, sum, NULL, NULL);
}
static __inline__
-unsigned int csum_partial_copy_from_user (
const char *src,
char *dst,
+unsigned int csum_partial_copy_from_user (
const unsigned char *src, unsigned
char *dst,
int len, int sum, int *err_ptr)
{
return csum_partial_copy_generic ( src, dst, len, sum, err_ptr, NULL);
int len, int sum, int *err_ptr)
{
return csum_partial_copy_generic ( src, dst, len, sum, err_ptr, NULL);
@@
-159,7
+160,6
@@
static __inline__ unsigned short ip_compute_csum(unsigned char * buff, int len)
}
#define _HAVE_ARCH_IPV6_CSUM
}
#define _HAVE_ARCH_IPV6_CSUM
-#ifdef CONFIG_IPV6
static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
struct in6_addr *daddr,
__u32 len,
static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
struct in6_addr *daddr,
__u32 len,
@@
-195,14
+195,13
@@
static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
return csum_fold(sum);
}
return csum_fold(sum);
}
-#endif
/*
* Copy and checksum to user
*/
#define HAVE_CSUM_COPY_USER
/*
* Copy and checksum to user
*/
#define HAVE_CSUM_COPY_USER
-static __inline__ unsigned int csum_and_copy_to_user (const
char *src,
- char __user *dst,
+static __inline__ unsigned int csum_and_copy_to_user (const
unsigned char *src,
+
unsigned
char __user *dst,
int len, int sum,
int *err_ptr)
{
int len, int sum,
int *err_ptr)
{