aboutsummaryrefslogtreecommitdiff
path: root/arch/m68knommu/lib
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2009-07-02 16:11:58 +1000
committerGreg Ungerer <gerg@uclinux.org>2009-09-16 09:43:37 +1000
commit6192c1ea0ac5806592c5c9cc2b2b94b0298df02b (patch)
tree456489cbe5ffa011c294f84558aa1bf5d512a829 /arch/m68knommu/lib
parent3ddc7e261a990d03fa4e78e37e6623ca45b18d77 (diff)
m68k: merge the mmu and non-mmu versions of checksum.h
The mmu and non-mmu versions of checksum.h are mostly the same, merge them. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68knommu/lib')
-rw-r--r--arch/m68knommu/lib/checksum.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/m68knommu/lib/checksum.c b/arch/m68knommu/lib/checksum.c
index 269d83bfbbe..eccf25d3d73 100644
--- a/arch/m68knommu/lib/checksum.c
+++ b/arch/m68knommu/lib/checksum.c
@@ -92,6 +92,7 @@ out:
return result;
}
+#ifdef CONFIG_COLDFIRE
/*
* This is a version of ip_compute_csum() optimized for IP headers,
* which always checksum on 4 octet boundaries.
@@ -100,6 +101,7 @@ __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
{
return (__force __sum16)~do_csum(iph,ihl*4);
}
+#endif
/*
* computes the checksum of a memory block at buff, length len,
@@ -127,15 +129,6 @@ __wsum csum_partial(const void *buff, int len, __wsum sum)
EXPORT_SYMBOL(csum_partial);
/*
- * this routine is used for miscellaneous IP-like checksums, mainly
- * in icmp.c
- */
-__sum16 ip_compute_csum(const void *buff, int len)
-{
- return (__force __sum16)~do_csum(buff,len);
-}
-
-/*
* copy from fs while checksumming, otherwise like csum_partial
*/