Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / asm-m68k / checksum.h

diff --git a/include/asm-m68k/checksum.h b/include/asm-m68k/checksum.h
index b3fdaa2..17280ef 100644 (file)
--- a/include/asm-m68k/checksum.h
+++ b/include/asm-m68k/checksum.h
@@ -25,11 +25,14 @@ unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum)
  * better 64-bit) boundary
  */
 
-extern unsigned int csum_partial_copy_from_user(const char *src, char *dst,
-                                               int len, int sum, int *csum_err);
+extern unsigned int csum_partial_copy_from_user(const unsigned char __user *src,
+                                               unsigned char *dst,
+                                               int len, int sum,
+                                               int *csum_err);
 
-extern unsigned int csum_partial_copy_nocheck(const char *src, char *dst,
-                                             int len, int sum);
+extern unsigned int csum_partial_copy_nocheck(const unsigned char *src,
+                                             unsigned char *dst, int len,
+                                             int sum);
 
 /*
  *     This is a version of ip_compute_csum() optimized for IP headers,
@@ -40,20 +43,21 @@ static inline unsigned short
 ip_fast_csum(unsigned char *iph, unsigned int ihl)
 {
        unsigned int sum = 0;
+       unsigned long tmp;
 
        __asm__ ("subqw #1,%2\n"
                 "1:\t"
-                "movel %1@+,%/d0\n\t"
-                "addxl %/d0,%0\n\t"
+                "movel %1@+,%3\n\t"
+                "addxl %3,%0\n\t"
                 "dbra  %2,1b\n\t"
-                "movel %0,%/d0\n\t"
-                "swap  %/d0\n\t"
-                "addxw %/d0,%0\n\t"
-                "clrw  %/d0\n\t"
-                "addxw %/d0,%0\n\t"
-                : "=d" (sum), "=a" (iph), "=d" (ihl)
+                "movel %0,%3\n\t"
+                "swap  %3\n\t"
+                "addxw %3,%0\n\t"
+                "clrw  %3\n\t"
+                "addxw %3,%0\n\t"
+                : "=d" (sum), "=&a" (iph), "=&d" (ihl), "=&d" (tmp)
                 : "0" (sum), "1" (iph), "2" (ihl)
-                : "d0");
+                : "memory");
        return ~sum;
 }
 
@@ -69,31 +73,31 @@ static inline unsigned int csum_fold(unsigned int sum)
                "clrw %1\n\t"
                "addxw %1, %0"
                : "=&d" (sum), "=&d" (tmp)
-               : "0" (sum), "1" (sum));
+               : "0" (sum), "1" (tmp));
        return ~sum;
 }
 
 
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 16-bit checksum, already complemented
- */
-
 static inline unsigned int
 csum_tcpudp_nofold(unsigned long saddr, unsigned long daddr, unsigned short len,
                  unsigned short proto, unsigned int sum)
 {
-       __asm__ ("addl  %1,%0\n\t"
+       __asm__ ("addl  %2,%0\n\t"
+                "addxl %3,%0\n\t"
                 "addxl %4,%0\n\t"
-                "addxl %5,%0\n\t"
                 "clrl %1\n\t"
                 "addxl %1,%0"
-                : "=&d" (sum), "=&d" (saddr)
-                : "0" (daddr), "1" (saddr), "d" (len + proto),
-                  "d"(sum));
+                : "=&d" (sum), "=d" (saddr)
+                : "g" (daddr), "1" (saddr), "d" (len + proto),
+                  "0" (sum));
        return sum;
 }
 
+
+/*
+ * computes the checksum of the TCP/UDP pseudo-header
+ * returns a 16-bit checksum, already complemented
+ */
 static inline unsigned short int
 csum_tcpudp_magic(unsigned long saddr, unsigned long daddr, unsigned short len,
                  unsigned short proto, unsigned int sum)