diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-05-10 21:32:21 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-05-10 21:32:21 +0000 |
| commit | 80bc05c94cf87003d8acd8a55b76755e2704aa0f (patch) | |
| tree | 2dd94daf36dd7798b8ddc5be8fdda5ef879e1b22 /sys/arch | |
| parent | 55e24b7a44b7de1d8d186a05b4319092d8f5f9f2 (diff) | |
enable arm optimized in4_cksum
ok drahn@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm/arm/genassym.cf | 14 | ||||
| -rw-r--r-- | sys/arch/arm/arm/in_cksum_arm.S | 8 | ||||
| -rw-r--r-- | sys/arch/arm/conf/files.arm | 3 |
3 files changed, 8 insertions, 17 deletions
diff --git a/sys/arch/arm/arm/genassym.cf b/sys/arch/arm/arm/genassym.cf index 83733107879..0951ebc3d31 100644 --- a/sys/arch/arm/arm/genassym.cf +++ b/sys/arch/arm/arm/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.3 2004/06/13 21:49:13 niklas Exp $ +# $OpenBSD: genassym.cf,v 1.4 2005/05/10 21:32:20 brad Exp $ # $NetBSD: genassym.cf,v 1.27 2003/11/04 10:33:16 dsl Exp$ # Copyright (c) 1982, 1990 The Regents of the University of California. @@ -176,10 +176,8 @@ member ci_ctrl endif # Constants required for in_cksum() and friends. -struct mbuf -member m_len -member m_data -member m_next -struct ip -member ip_src -member ip_dst +define M_LEN offsetof(struct mbuf, m_len) +define M_DATA offsetof(struct mbuf, m_data) +define M_NEXT offsetof(struct mbuf, m_next) +define IP_SRC offsetof(struct ip, ip_src) +define IP_DST offsetof(struct ip, ip_dst) diff --git a/sys/arch/arm/arm/in_cksum_arm.S b/sys/arch/arm/arm/in_cksum_arm.S index cde73dc4d36..aa79b930a3c 100644 --- a/sys/arch/arm/arm/in_cksum_arm.S +++ b/sys/arch/arm/arm/in_cksum_arm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: in_cksum_arm.S,v 1.1 2004/02/01 05:09:48 drahn Exp $ */ +/* $OpenBSD: in_cksum_arm.S,v 1.2 2005/05/10 21:32:20 brad Exp $ */ /* $NetBSD: in_cksum_arm.S,v 1.3 2003/11/26 10:31:53 rearnsha Exp $ */ /* @@ -43,7 +43,6 @@ #include <machine/asm.h> #include "assym.h" - /* * int in_cksum(struct mbuf *m, int len) * @@ -89,9 +88,6 @@ ENTRY(in_cksum) eor r0, r0, r1 ldmfd sp!, {r4-r11,pc} - -#if 0 - /* ALSO IN in4_cksum.c */ #ifdef INET /* * int in4_cksum(struct mbuf *m, u_int8_t nxt, int off, int len) @@ -226,8 +222,6 @@ ENTRY(in4_cksum) .asciz "in4_cksum: out of mbufs\n" .align 5 #endif /* INET */ -#endif - /* * The main in*_cksum() workhorse... diff --git a/sys/arch/arm/conf/files.arm b/sys/arch/arm/conf/files.arm index 8ebced6cbfc..c080f51a262 100644 --- a/sys/arch/arm/conf/files.arm +++ b/sys/arch/arm/conf/files.arm @@ -1,4 +1,4 @@ -# $OpenBSD: files.arm,v 1.6 2005/05/01 21:36:55 brad Exp $ +# $OpenBSD: files.arm,v 1.7 2005/05/10 21:32:20 brad Exp $ # $NetBSD: files.arm,v 1.76 2003/11/05 12:53:15 scw Exp $ # CPU types. Make sure to update <arm/cpuconf.h> if you change this list. @@ -33,7 +33,6 @@ # generic networking files file arch/arm/arm/in_cksum_arm.S inet -file netinet/in4_cksum.c inet file netns/ns_cksum.c ns # DDB |