lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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:50 -07:00
committed by Ingo Molnar
parent 0883e91ae2
commit 3d3c6e1003
1 changed files with 57 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
include/asm-x86/checksum_64.h
View File

@@ -21,13 +21,11 @@
*/ */
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"
" adcl $0xffff,%0" : "=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);
} }
@@ -48,29 +46,29 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
{ {
unsigned int sum; unsigned int sum;
asm( " movl (%1), %0\n" asm(" 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:" "2:"
/* 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;
} }
@@ -93,10 +91,10 @@ csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
" 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;
} }
@@ -111,11 +109,11 @@ csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
* Returns the 16bit pseudo header checksum the input data already * Returns the 16bit pseudo header checksum the input data already
* complemented and ready to be filled in. * complemented and ready to be filled in.
*/ */
static inline __sum16 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
csum_tcpudp_magic(__be32 saddr, __be32 daddr, unsigned short len,
unsigned short len, unsigned short proto, __wsum sum) unsigned short proto, __wsum sum)
{ {
return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum)); return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
} }
/** /**
@@ -136,17 +134,16 @@ extern __wsum csum_partial(const void *buff, int len, __wsum sum);
/* Do not call this directly. Use the wrappers below */ /* Do not call this directly. Use the wrappers below */
extern __wsum csum_partial_copy_generic(const void *src, const void *dst, extern __wsum csum_partial_copy_generic(const void *src, const void *dst,
int len, int len, __wsum sum,
__wsum sum, int *src_err_ptr, int *dst_err_ptr);
int *src_err_ptr, int *dst_err_ptr);
extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst, extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst,
int len, __wsum isum, int *errp); int len, __wsum isum, int *errp);
extern __wsum csum_partial_copy_to_user(const void *src, void __user *dst, extern __wsum csum_partial_copy_to_user(const void *src, void __user *dst,
int len, __wsum isum, int *errp); int len, __wsum isum, int *errp);
extern __wsum csum_partial_copy_nocheck(const void *src, void *dst, int len, extern __wsum csum_partial_copy_nocheck(const void *src, void *dst,
__wsum sum); int len, __wsum sum);
/* Old names. To be removed. */ /* Old names. To be removed. */
#define csum_and_copy_to_user csum_partial_copy_to_user #define csum_and_copy_to_user csum_partial_copy_to_user
@@ -192,4 +189,3 @@ static inline unsigned add32_with_carry(unsigned a, unsigned b)
} }
#endif #endif