ipv4: Update parameters for csum_tcpudp_magic to their original types

[cascardo/linux.git] / arch / nios2 / include / asm / checksum.h

diff --git a/arch/nios2/include/asm/checksum.h b/arch/nios2/include/asm/checksum.h
index 6bc1f0d..703c5ee 100644 (file)
--- a/arch/nios2/include/asm/checksum.h
+++ b/arch/nios2/include/asm/checksum.h
@@ -45,8 +45,7 @@ static inline __sum16 csum_fold(__wsum sum)
  */
 #define csum_tcpudp_nofold csum_tcpudp_nofold
 static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                       unsigned short len,
-                                       unsigned short proto,
+                                       __u32 len, __u8 proto,
                                        __wsum sum)
 {
        __asm__ __volatile__(
@@ -60,7 +59,7 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
                "cmpltu r8, %0, %3\n"
                "add    %0, %0, r8\n"   /* add carry */
                : "=r" (sum), "=r" (saddr)
-               : "r" (daddr), "r" ((ntohs(len) << 16) + (proto * 256)),
+               : "r" (daddr), "r" ((len + proto) << 8),
                  "0" (sum),
                  "1" (saddr)
                : "r8");
@@ -69,8 +68,8 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
 }
 
 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                       unsigned short len,
-                                       unsigned short proto, __wsum sum)
+                                       __u32 len, __u8 proto,
+                                       __wsum sum)
 {
        return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
 }