mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

include/asm-x86/checksum_32.h: checkpatch cleanups - formatting only 

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Joe Perches 2008-03-23 01:01:49 -07:00 committed by Ingo Molnar
parent 3f61b19a9f
commit 0883e91ae2
1 changed files with 75 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
include/asm-x86/checksum_32.h
View File

@ -28,7 +28,8 @@ asmlinkage __wsum csum_partial(const void *buff, int len, __wsum sum);
*/ */
asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst, asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); int len, __wsum 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
@ -37,20 +38,20 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
* If you use these functions directly please don't forget the * If you use these functions directly please don't forget the
* access_ok(). * access_ok().
*/ */
static __inline__ static inline __wsum csum_partial_copy_nocheck(const void *src, void *dst,
__wsum csum_partial_copy_nocheck (const void *src, void *dst, int len, __wsum sum)
int len, __wsum sum)
{ {
return csum_partial_copy_generic ( src, dst, len, sum, NULL, NULL); return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL);
} }
static __inline__ static inline __wsum csum_partial_copy_from_user(const void __user *src,
__wsum csum_partial_copy_from_user(const void __user *src, void *dst, void *dst,
int len, __wsum sum, int *err_ptr) int len, __wsum sum,
int *err_ptr)
{ {
might_sleep(); might_sleep();
return csum_partial_copy_generic((__force void *)src, dst, return csum_partial_copy_generic((__force void *)src, dst,
len, sum, err_ptr, NULL); len, sum, err_ptr, NULL);
} }
/* /*
@ -64,30 +65,29 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
{ {
unsigned int sum; unsigned int sum;
__asm__ __volatile__( asm volatile("movl (%1), %0 ;\n"
"movl (%1), %0 ;\n" "subl $4, %2 ;\n"
"subl $4, %2 ;\n" "jbe 2f ;\n"
"jbe 2f ;\n" "addl 4(%1), %0 ;\n"
"addl 4(%1), %0 ;\n" "adcl 8(%1), %0 ;\n"
"adcl 8(%1), %0 ;\n" "adcl 12(%1), %0;\n"
"adcl 12(%1), %0 ;\n" "1: adcl 16(%1), %0 ;\n"
"1: adcl 16(%1), %0 ;\n" "lea 4(%1), %1 ;\n"
"lea 4(%1), %1 ;\n" "decl %2 ;\n"
"decl %2 ;\n" "jne 1b ;\n"
"jne 1b ;\n" "adcl $0, %0 ;\n"
"adcl $0, %0 ;\n" "movl %0, %2 ;\n"
"movl %0, %2 ;\n" "shrl $16, %0 ;\n"
"shrl $16, %0 ;\n" "addw %w2, %w0 ;\n"
"addw %w2, %w0 ;\n" "adcl $0, %0 ;\n"
"adcl $0, %0 ;\n" "notl %0 ;\n"
"notl %0 ;\n" "2: ;\n"
"2: ;\n"
/* Since the input registers which are loaded with iph and ihl /* Since the input registers which are loaded with iph and ihl
are modified, we must also specify them as outputs, or gcc are modified, we must also specify them as outputs, or gcc
will assume they contain their original values. */ will assume they contain their original values. */
: "=r" (sum), "=r" (iph), "=r" (ihl) : "=r" (sum), "=r" (iph), "=r" (ihl)
: "1" (iph), "2" (ihl) : "1" (iph), "2" (ihl)
: "memory"); : "memory");
return (__force __sum16)sum; return (__force __sum16)sum;
} }
@ -97,29 +97,27 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
static inline __sum16 csum_fold(__wsum sum) static inline __sum16 csum_fold(__wsum sum)
{ {
__asm__( asm("addl %1, %0 ;\n"
"addl %1, %0 ;\n" "adcl $0xffff, %0 ;\n"
"adcl $0xffff, %0 ;\n" : "=r" (sum)
: "=r" (sum) : "r" ((__force u32)sum << 16),
: "r" ((__force u32)sum << 16), "0" ((__force u32)sum & 0xffff0000));
"0" ((__force u32)sum & 0xffff0000)
);
return (__force __sum16)(~(__force u32)sum >> 16); return (__force __sum16)(~(__force u32)sum >> 16);
} }
static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
unsigned short len, unsigned short len,
unsigned short proto, unsigned short proto,
__wsum sum) __wsum sum)
{ {
__asm__( asm("addl %1, %0 ;\n"
"addl %1, %0 ;\n" "adcl %2, %0 ;\n"
"adcl %2, %0 ;\n" "adcl %3, %0 ;\n"
"adcl %3, %0 ;\n" "adcl $0, %0 ;\n"
"adcl $0, %0 ;\n" : "=r" (sum)
: "=r" (sum) : "g" (daddr), "g"(saddr),
: "g" (daddr), "g"(saddr), "g"((len + proto) << 8), "0"(sum)); "g" ((len + proto) << 8), "0" (sum));
return sum; return sum;
} }
/* /*
@ -127,11 +125,11 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
* returns a 16-bit checksum, already complemented * returns a 16-bit checksum, already complemented
*/ */
static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
unsigned short len, unsigned short len,
unsigned short proto, unsigned short proto,
__wsum sum) __wsum sum)
{ {
return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum)); return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
} }
/* /*
@ -141,30 +139,29 @@ static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
static inline __sum16 ip_compute_csum(const void *buff, int len) static inline __sum16 ip_compute_csum(const void *buff, int len)
{ {
return csum_fold (csum_partial(buff, len, 0)); return csum_fold(csum_partial(buff, len, 0));
} }
#define _HAVE_ARCH_IPV6_CSUM #define _HAVE_ARCH_IPV6_CSUM
static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
const struct in6_addr *daddr, const struct in6_addr *daddr,
__u32 len, unsigned short proto, __u32 len, unsigned short proto,
__wsum sum) __wsum sum)
{ {
__asm__( asm("addl 0(%1), %0 ;\n"
"addl 0(%1), %0 ;\n" "adcl 4(%1), %0 ;\n"
"adcl 4(%1), %0 ;\n" "adcl 8(%1), %0 ;\n"
"adcl 8(%1), %0 ;\n" "adcl 12(%1), %0 ;\n"
"adcl 12(%1), %0 ;\n" "adcl 0(%2), %0 ;\n"
"adcl 0(%2), %0 ;\n" "adcl 4(%2), %0 ;\n"
"adcl 4(%2), %0 ;\n" "adcl 8(%2), %0 ;\n"
"adcl 8(%2), %0 ;\n" "adcl 12(%2), %0 ;\n"
"adcl 12(%2), %0 ;\n" "adcl %3, %0 ;\n"
"adcl %3, %0 ;\n" "adcl %4, %0 ;\n"
"adcl %4, %0 ;\n" "adcl $0, %0 ;\n"
"adcl $0, %0 ;\n" : "=&r" (sum)
: "=&r" (sum) : "r" (saddr), "r" (daddr),
: "r" (saddr), "r" (daddr), "r" (htonl(len)), "r" (htonl(proto)), "0" (sum));
"r"(htonl(len)), "r"(htonl(proto)), "0"(sum));
return csum_fold(sum); return csum_fold(sum);
} }
@ -173,14 +170,15 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
* Copy and checksum to user * Copy and checksum to user
*/ */
#define HAVE_CSUM_COPY_USER #define HAVE_CSUM_COPY_USER
static __inline__ __wsum csum_and_copy_to_user(const void *src, static inline __wsum csum_and_copy_to_user(const void *src,
void __user *dst, void __user *dst,
int len, __wsum sum, int len, __wsum sum,
int *err_ptr) int *err_ptr)
{ {
might_sleep(); might_sleep();
if (access_ok(VERIFY_WRITE, dst, len)) if (access_ok(VERIFY_WRITE, dst, len))
return csum_partial_copy_generic(src, (__force void *)dst, len, sum, NULL, err_ptr); return csum_partial_copy_generic(src, (__force void *)dst,
len, sum, NULL, err_ptr);
if (len) if (len)
*err_ptr = -EFAULT; *err_ptr = -EFAULT;