Module Name: src
Committed By: skrll
Date: Sat Feb 14 23:12:29 UTC 2015
Modified Files:
src/sys/arch/arm/arm: cpu_in_cksum.S
Log Message:
Correct arm_cksumdata for <4 bytes of data
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/arm/cpu_in_cksum.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/cpu_in_cksum.S
diff -u src/sys/arch/arm/arm/cpu_in_cksum.S:1.9 src/sys/arch/arm/arm/cpu_in_cksum.S:1.10
--- src/sys/arch/arm/arm/cpu_in_cksum.S:1.9 Tue Jan 6 16:24:58 2015
+++ src/sys/arch/arm/arm/cpu_in_cksum.S Sat Feb 14 23:12:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_in_cksum.S,v 1.9 2015/01/06 16:24:58 christos Exp $ */
+/* $NetBSD: cpu_in_cksum.S,v 1.10 2015/02/14 23:12:29 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <machine/asm.h>
-RCSID("$NetBSD: cpu_in_cksum.S,v 1.9 2015/01/06 16:24:58 christos Exp $")
+RCSID("$NetBSD: cpu_in_cksum.S,v 1.10 2015/02/14 23:12:29 skrll Exp $")
#include "assym.h"
@@ -191,8 +191,7 @@ ASENTRY_NP(arm_cksumdata)
RETc(eq) /* done */
#endif
adds r7, r7, r1 /* undo sub */
- adds r7, r7, r1 /* r7 = offset + len */
- rsb r7, r7, #4
+ subs r7, r7, r1
lsls r7, r7, #3
#if defined(__ARMEB__)
lsrs r2, r2, r7