patch-2.1.101 linux/include/asm-arm/checksum.h

• Lines: 156
• Date: Fri May 8 00:42:40 1998
• Orig file: v2.1.100/linux/include/asm-arm/checksum.h
• Orig date: Tue Jan 20 16:39:42 1998

diff -u --recursive --new-file v2.1.100/linux/include/asm-arm/checksum.h linux/include/asm-arm/checksum.h
@@ -35,14 +35,19 @@
  * better 64-bit) boundary
  */
 
-extern
-unsigned int csum_partial_copy_from_user (const char *src, char *dst, int len, int sum, int *err_ptr);
+unsigned int
+csum_partial_copy_nocheck(const char *src, char *dst, int len, int sum);
 
+unsigned int
+csum_partial_copy_from_user(const char *src, char *dst, int len, int sum, int *err_ptr);
+
+#if 0
 /*
  * This combination is currently not used, but possible:
  */
-extern
-unsigned int csum_partial_copy_to_user (const char *src, char *dst, int len, int sum, int *err_ptr);
+unsigned int
+csum_partial_copy_to_user(const char *src, char *dst, int len, int sum, int *err_ptr);
+#endif
 
 /*
  * These are the old (and unsafe) way of doing checksums, a warning message will be
@@ -51,7 +56,8 @@
  * these functions should go away after some time.
  */
 #define csum_partial_copy_fromuser csum_partial_copy
-unsigned int csum_partial_copy(const char *src, char *dst, int len, int sum);
+unsigned int
+csum_partial_copy(const char *src, char *dst, int len, int sum);
 
 /*
  *	This is a version of ip_compute_csum() optimized for IP headers,
@@ -62,8 +68,9 @@
  *	Note: the order that the LDM registers are loaded with respect to
  *	the adc's doesn't matter.
  */
-static inline unsigned short ip_fast_csum(unsigned char * iph,
-					  unsigned int ihl) {
+static inline unsigned short
+ip_fast_csum(unsigned char * iph, unsigned int ihl)
+{
 	unsigned int sum, tmp1;
 
     __asm__ __volatile__("
@@ -92,63 +99,64 @@
 }
 
 /*
- * 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) {
-    __asm__ __volatile__("
-    adds	%0, %0, %1
-    adcs	%0, %0, %4
-    adcs	%0, %0, %5
-    adc		%0, %0, #0
-    adds	%0, %0, %0, lsl #16
-    addcs	%0, %0, #0x10000
-    mvn		%0, %0
-    mov		%0, %0, lsr #16
-	"
-	: "=&r" (sum), "=&r" (saddr)
-	: "0" (daddr), "1"(saddr), "r"((ntohs(len)<<16)+proto*256), "r"(sum));
-	return((unsigned short)sum);
-}
-
-/*
  * 	Fold a partial checksum without adding pseudo headers
  */
-static inline unsigned int csum_fold(unsigned int sum)
+static inline unsigned int
+csum_fold(unsigned int sum)
 {
-    __asm__ __volatile__("
-    adds	%0, %0, %0, lsl #16
-    addcs	%0, %0, #0x10000
-    mvn		%0, %0
-    mov		%0, %0, lsr #16
-	"
+	__asm__("
+	adds	%0, %0, %0, lsl #16
+	addcs	%0, %0, #0x10000"
 	: "=r" (sum)
 	: "0" (sum));
+	return (~sum) >> 16;
+}
+
+static inline unsigned long
+csum_tcpudp_nofold(unsigned long saddr, unsigned long daddr, unsigned short len,
+		   unsigned short proto, unsigned int sum)
+{
+	__asm__("
+	adds	%0, %0, %1
+	adcs	%0, %0, %2
+	adcs	%0, %0, %3
+	adc	%0, %0, #0"
+	: "=&r"(sum)
+	: "r" (daddr), "r" (saddr), "r" ((ntohs(len)<<16)+proto*256), "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)
+{
+	return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
+}
+
 
 /*
  * this routine is used for miscellaneous IP-like checksums, mainly
  * in icmp.c
  */
-
-static inline unsigned short ip_compute_csum(unsigned char * buff, int len) {
-    unsigned int sum;
-
-    __asm__ __volatile__("
-    adds	%0, %0, %0, lsl #16
-    addcs	%0, %0, #0x10000
-    mvn		%0, %0
-    mov		%0, %0, lsr #16
-	"
-	: "=r"(sum)
-	: "0" (csum_partial(buff, len, 0)));
-	return(sum);
+static inline unsigned short
+ip_compute_csum(unsigned char * buff, int len)
+{
+	return csum_fold(csum_partial(buff, len, 0));
 }
 
+#define _HAVE_ARCH_IPV6_CSUM
+extern unsigned long
+__csum_ipv6_magic(struct in6_addr *saddr, struct in6_addr *daddr, __u32 len,
+		__u32 proto, unsigned int sum);
+
+extern __inline__ unsigned short int
+csum_ipv6_magic(struct in6_addr *saddr, struct in6_addr *daddr, __u16 len,
+		unsigned short proto, unsigned int sum)
+{
+	return csum_fold(__csum_ipv6_magic(saddr, daddr, htonl((__u32)len),
+					   htonl(proto), sum));
+}
 #endif