ipv4: Update parameters for csum_tcpudp_magic to their original types

[cascardo/linux.git] / arch / alpha / lib / checksum.c

diff --git a/arch/alpha/lib/checksum.c b/arch/alpha/lib/checksum.c
index 8698e07..377f9e3 100644 (file)
--- a/arch/alpha/lib/checksum.c
+++ b/arch/alpha/lib/checksum.c
@@ -5,7 +5,7 @@
  * in an architecture-specific manner due to speed..
  * Comments in other versions indicate that the algorithms are from RFC1071
  *
- * accellerated versions (and 21264 assembly versions ) contributed by
+ * accelerated versions (and 21264 assembly versions ) contributed by
  *     Rick Gorton     <rick.gorton@alpha-processor.com>
  */
  
@@ -42,9 +42,7 @@ static inline unsigned short from64to16(unsigned long x)
  * returns a 16-bit checksum, already complemented.
  */
 __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                  unsigned short len,
-                                  unsigned short proto,
-                                  __wsum sum)
+                         __u32 len, __u8 proto, __wsum sum)
 {
        return (__force __sum16)~from64to16(
                (__force u64)saddr + (__force u64)daddr +
@@ -52,9 +50,7 @@ __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
 }
 
 __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                  unsigned short len,
-                                  unsigned short proto,
-                                  __wsum sum)
+                         __u32 len, __u8 proto, __wsum sum)
 {
        unsigned long result;