[NET]: IA64 checksum annotations and cleanups.

* sanitize prototypes, annotate
* ntohs -> shift in checksum calculations
* kill access_ok() in csum_partial_copy_from_user
* collapse do_csum_partial_copy_from_user

Signed-off-by: Al Viro <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
Al Viro 2006-11-14 21:16:30 -08:00 • committed by David S. Miller
commit 322529961e
3 changed files with 41 additions and 59 deletions

View file

@ -10,23 +10,21 @@
* This is a version of ip_compute_csum() optimized for IP headers,
* which always checksum on 4 octet boundaries.
*/
extern unsigned short ip_fast_csum (unsigned char * iph, unsigned int ihl);
extern __sum16 ip_fast_csum(const void *iph, unsigned int ihl);
/*
* Computes the checksum of the TCP/UDP pseudo-header returns a 16-bit
* checksum, already complemented
*/
extern unsigned short int csum_tcpudp_magic (unsigned long saddr,
unsigned long daddr,
extern __sum16 csum_tcpudp_magic (__be32 saddr, __be32 daddr,
unsigned short len,
unsigned short proto,
unsigned int sum);
__wsum sum);
extern unsigned int csum_tcpudp_nofold (unsigned long saddr,
unsigned long daddr,
extern __wsum csum_tcpudp_nofold (__be32 saddr, __be32 daddr,
unsigned short len,
unsigned short proto,
unsigned int sum);
__wsum sum);
/*
* Computes the checksum of a memory block at buff, length len,
@ -40,8 +38,7 @@ extern unsigned int csum_tcpudp_nofold (unsigned long saddr,
*
* it's best to have buff aligned on a 32-bit boundary
*/
extern unsigned int csum_partial (const unsigned char * buff, int len,
unsigned int sum);
extern __wsum csum_partial(const void *buff, int len, __wsum sum);
/*
* Same as csum_partial, but copies from src while it checksums.
@ -49,28 +46,28 @@ extern unsigned int csum_partial (const unsigned char * buff, int len,
* Here it is even more important to align src and dst on a 32-bit (or
* even better 64-bit) boundary.
*/
extern unsigned int csum_partial_copy_from_user (const char *src, char *dst,
int len, unsigned int sum,
extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst,
int len, __wsum sum,
int *errp);
extern unsigned int csum_partial_copy_nocheck (const char *src, char *dst,
int len, unsigned int sum);
extern __wsum csum_partial_copy_nocheck(const void *src, void *dst,
int len, __wsum sum);
/*
* This routine is used for miscellaneous IP-like checksums, mainly in
* icmp.c
*/
extern unsigned short ip_compute_csum (unsigned char *buff, int len);
extern __sum16 ip_compute_csum(const void *buff, int len);
/*
* Fold a partial checksum without adding pseudo headers.
*/
static inline unsigned short
csum_fold (unsigned int sum)
static inline __sum16 csum_fold(__wsum csum)
{
u32 sum = (__force u32)csum;
sum = (sum & 0xffff) + (sum >> 16);
sum = (sum & 0xffff) + (sum >> 16);
return ~sum;
return (__force __sum16)~sum;
}
#endif /* _ASM_IA64_CHECKSUM_H */