|
@@ -53,10 +53,8 @@ static inline __sum16 csum_fold(__wsum sum)
|
|
|
return (__force __sum16)(~((__force u32)sum + tmp) >> 16);
|
|
|
}
|
|
|
|
|
|
-static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
|
|
|
- unsigned short len,
|
|
|
- unsigned short proto,
|
|
|
- __wsum sum)
|
|
|
+static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
|
|
|
+ __u8 proto, __wsum sum)
|
|
|
{
|
|
|
#ifdef __powerpc64__
|
|
|
unsigned long s = (__force u32)sum;
|
|
@@ -83,10 +81,8 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
|
|
|
* computes the checksum of the TCP/UDP pseudo-header
|
|
|
* returns a 16-bit checksum, already complemented
|
|
|
*/
|
|
|
-static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
|
|
|
- unsigned short len,
|
|
|
- unsigned short proto,
|
|
|
- __wsum sum)
|
|
|
+static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len,
|
|
|
+ __u8 proto, __wsum sum)
|
|
|
{
|
|
|
return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
|
|
|
}
|