summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2009-06-23 21:37:26 +0200
committerArnd Bergmann <arnd@arndb.de>2009-11-03 16:06:52 +0100
commit20c1f641bb80fb272dec959a5caabed92e5a422e (patch)
treef86824522190b527c211ae43054e1e0a1f25568d
parentc44ba9f6684946b156335da6a6d55f0b8cf7cb72 (diff)
downloadop-kernel-dev-20c1f641bb80fb272dec959a5caabed92e5a422e.zip
op-kernel-dev-20c1f641bb80fb272dec959a5caabed92e5a422e.tar.gz
lib/checksum.c: make do_csum optional
Mike Frysinger suggested that do_csum should be optional so that an architecture can use the generic checksum code but still provide an optimized fast-path for the most critical function. This can mean an implementation using inline assembly, or in case of Alpha one using 64-bit arithmetic in C. Cc: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--lib/checksum.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/checksum.c b/lib/checksum.c
index 886b48db..b08c2d0 100644
--- a/lib/checksum.c
+++ b/lib/checksum.c
@@ -37,6 +37,7 @@
#include <asm/byteorder.h>
+#ifndef do_csum
static inline unsigned short from32to16(unsigned int x)
{
/* add up 16-bit and 16-bit for 16+c bit */
@@ -102,6 +103,7 @@ static unsigned int do_csum(const unsigned char *buff, int len)
out:
return result;
}
+#endif
/*
* This is a version of ip_compute_csum() optimized for IP headers,
OpenPOWER on IntegriCloud