From owner-p4-projects@FreeBSD.ORG  Thu Mar  9 22:41:06 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C7A0316A423; Thu,  9 Mar 2006 22:41:05 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6D01616A422
	for <perforce@freebsd.org>; Thu,  9 Mar 2006 22:41:05 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 14BB043D55
	for <perforce@freebsd.org>; Thu,  9 Mar 2006 22:41:05 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k29Mf4vJ037256
	for <perforce@freebsd.org>; Thu, 9 Mar 2006 22:41:04 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k29Mf4rN037253
	for perforce@freebsd.org; Thu, 9 Mar 2006 22:41:04 GMT
	(envelope-from cognet@freebsd.org)
Date: Thu, 9 Mar 2006 22:41:04 GMT
Message-Id: <200603092241.k29Mf4rN037253@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93076 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Mar 2006 22:41:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=93076

Change 93076 by cognet@cognet on 2006/03/09 22:40:51

	grrr
	The asm in_cksum_hdr() is bogus. Bring in a C version until I
	understand what happens, so that Warner can still work.
	
	Your usual pointy hat to:	cognet

Affected files ...

.. //depot/projects/arm/src/sys/arm/arm/in_cksum.c#4 edit
.. //depot/projects/arm/src/sys/arm/include/in_cksum.h#3 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/arm/in_cksum.c#4 (text+ko) ====

@@ -130,3 +130,12 @@
 	REDUCE16;
 	return (~sum & 0xffff);
 }
+
+u_int in_cksum_hdr(const struct ip *ip)
+{
+	u_int64_t sum = do_cksum(ip, sizeof(struct ip));
+	union q_util q_util;
+    	union l_util l_util;
+	REDUCE16;
+	return (~sum & 0xffff);
+}			    

==== //depot/projects/arm/src/sys/arm/include/in_cksum.h#3 (text+ko) ====

@@ -46,6 +46,8 @@
 u_short in_addword(u_short sum, u_short b);
 u_short in_cksum_skip(struct mbuf *m, int len, int skip);
 u_int do_cksum(const void *, int);
+u_int in_cksum_hdr(const struct ip *);
+#if 0
 static __inline u_int
 in_cksum_hdr(const struct ip *ip)
 {
@@ -120,6 +122,7 @@
 		sum -= 0xffff;
 	return (~sum & 0xffff);
 }
+#endif
 
 static __inline u_short
 in_pseudo(u_int sum, u_int b, u_int c)