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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
alpha
/
lib
/
checksum.c
diff --git
a/arch/alpha/lib/checksum.c
b/arch/alpha/lib/checksum.c
index
89044e6
..
ab3761c
100644
(file)
--- a/
arch/alpha/lib/checksum.c
+++ b/
arch/alpha/lib/checksum.c
@@
-41,28
+41,25
@@
static inline unsigned short from64to16(unsigned long x)
* computes the checksum of the TCP/UDP pseudo-header
* returns a 16-bit checksum, already complemented.
*/
* computes the checksum of the TCP/UDP pseudo-header
* returns a 16-bit checksum, already complemented.
*/
-unsigned short int csum_tcpudp_magic(unsigned long saddr,
- unsigned long daddr,
+__sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
unsigned short len,
unsigned short proto,
unsigned short len,
unsigned short proto,
-
unsigned int
sum)
+
__wsum
sum)
{
{
- return
~from64to16(saddr + daddr + sum +
- (
(unsigned long) ntohs(len) << 16)
+
- (
(unsigned long) proto
<< 8));
+ return
(__force __sum16)~from64to16(
+ (
__force u64)saddr + (__force u64)daddr
+
+ (
__force u64)sum + ((len + proto)
<< 8));
}
}
-unsigned int csum_tcpudp_nofold(unsigned long saddr,
- unsigned long daddr,
+__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
unsigned short len,
unsigned short proto,
unsigned short len,
unsigned short proto,
-
unsigned int
sum)
+
__wsum
sum)
{
unsigned long result;
{
unsigned long result;
- result = (saddr + daddr + sum +
- ((unsigned long) ntohs(len) << 16) +
- ((unsigned long) proto << 8));
+ result = (__force u64)saddr + (__force u64)daddr +
+ (__force u64)sum + ((len + proto) << 8);
/* Fold down to 32-bits so we don't lose in the typedef-less
network stack. */
/* Fold down to 32-bits so we don't lose in the typedef-less
network stack. */
@@
-70,7
+67,7
@@
unsigned int csum_tcpudp_nofold(unsigned long saddr,
result = (result & 0xffffffff) + (result >> 32);
/* 33 to 32 */
result = (result & 0xffffffff) + (result >> 32);
result = (result & 0xffffffff) + (result >> 32);
/* 33 to 32 */
result = (result & 0xffffffff) + (result >> 32);
- return result;
+ return
(__force __wsum)
result;
}
/*
}
/*
@@
-146,9
+143,9
@@
out:
* This is a version of ip_compute_csum() optimized for IP headers,
* which always checksum on 4 octet boundaries.
*/
* This is a version of ip_compute_csum() optimized for IP headers,
* which always checksum on 4 octet boundaries.
*/
-
unsigned short ip_fast_csum(unsigned char *
iph, unsigned int ihl)
+
__sum16 ip_fast_csum(const void *
iph, unsigned int ihl)
{
{
- return ~do_csum(iph,ihl*4);
+ return
(__force __sum16)
~do_csum(iph,ihl*4);
}
/*
}
/*
@@
-163,15
+160,15
@@
unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl)
*
* it's best to have buff aligned on a 32-bit boundary
*/
*
* it's best to have buff aligned on a 32-bit boundary
*/
-
unsigned int csum_partial(const unsigned char * buff, int len, unsigned int
sum)
+
__wsum csum_partial(const void *buff, int len, __wsum
sum)
{
unsigned long result = do_csum(buff, len);
/* add in old sum, and carry.. */
{
unsigned long result = do_csum(buff, len);
/* add in old sum, and carry.. */
- result += sum;
+ result +=
(__force u32)
sum;
/* 32+c bits -> 32 bits */
result = (result & 0xffffffff) + (result >> 32);
/* 32+c bits -> 32 bits */
result = (result & 0xffffffff) + (result >> 32);
- return result;
+ return
(__force __wsum)
result;
}
EXPORT_SYMBOL(csum_partial);
}
EXPORT_SYMBOL(csum_partial);
@@
-180,7
+177,7
@@
EXPORT_SYMBOL(csum_partial);
* this routine is used for miscellaneous IP-like checksums, mainly
* in icmp.c
*/
* this routine is used for miscellaneous IP-like checksums, mainly
* in icmp.c
*/
-
unsigned short ip_compute_csum(unsigned char *
buff, int len)
+
__sum16 ip_compute_csum(const void *
buff, int len)
{
{
- return ~from64to16(do_csum(buff,len));
+ return
(__force __sum16)
~from64to16(do_csum(buff,len));
}
}