Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3767f3f1 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Convert sh64 to use the generic checksum code. 



This plugs in GENERIC_CSUM support on sh64, and kills off all of the old
references.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 2b74b856

arch/sh/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ config GENERIC_BUG 
	def_bool y

	depends on BUG && SUPERH32



config GENERIC_CSUM

	def_bool y

	depends on SUPERH64



config GENERIC_FIND_NEXT_BIT

	def_bool y

arch/sh/include/asm/checksum.h

+1 −1
Original line number Diff line number Diff line 
#ifdef CONFIG_SUPERH32

# include "checksum_32.h"

#else

# include "checksum_64.h"

# include <asm-generic/checksum.h>

#endif

arch/sh/include/asm/checksum_64.h

deleted100644 → 0
+0 −78
Original line number Diff line number Diff line 
#ifndef __ASM_SH_CHECKSUM_64_H

#define __ASM_SH_CHECKSUM_64_H



/*

 * include/asm-sh/checksum_64.h

 *

 * Copyright (C) 2000, 2001  Paolo Alberelli

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */



/*

 * computes the checksum of a memory block at buff, length len,

 * and adds in "sum" (32-bit)

 *

 * returns a 32-bit number suitable for feeding into itself

 * or csum_tcpudp_magic

 *

 * this function must be called with even lengths, except

 * for the last fragment, which may be odd

 *

 * it's best to have buff aligned on a 32-bit boundary

 */

asmlinkage __wsum csum_partial(const void *buff, int len, __wsum sum);



/*

 *	Note: when you get a NULL pointer exception here this means someone

 *	passed in an incorrect kernel address to one of these functions.

 *

 *	If you use these functions directly please don't forget the

 *	access_ok().

 */





__wsum csum_partial_copy_nocheck(const void *src, void *dst, int len,

				       __wsum sum);



__wsum csum_partial_copy_from_user(const void __user *src, void *dst,

					 int len, __wsum sum, int *err_ptr);



static inline __sum16 csum_fold(__wsum csum)

{

	u32 sum = (__force u32)csum;

        sum = (sum & 0xffff) + (sum >> 16);

        sum = (sum & 0xffff) + (sum >> 16);

        return (__force __sum16)~sum;

}



__sum16 ip_fast_csum(const void *iph, unsigned int ihl);



__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,

				 unsigned short len, unsigned short proto,

				 __wsum sum);



/*

 * computes the checksum of the TCP/UDP pseudo-header

 * returns a 16-bit checksum, already complemented

 */

static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,

						   unsigned short len,

						   unsigned short proto,

						   __wsum sum)

{

	return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));

}



/*

 * this routine is used for miscellaneous IP-like checksums, mainly

 * in icmp.c

 */

static inline __sum16 ip_compute_csum(const void *buff, int len)

{

	return csum_fold(csum_partial(buff, len, 0));

}



#endif /* __ASM_SH_CHECKSUM_64_H */

arch/sh/kernel/sh_ksyms_64.c

+0 −7
Original line number Diff line number Diff line
@@ -38,13 +38,6 @@ EXPORT_SYMBOL(clear_user_page); 
EXPORT_SYMBOL(flush_dcache_page);

#endif



/* Networking helper routines. */

EXPORT_SYMBOL(csum_partial);

EXPORT_SYMBOL(csum_partial_copy_nocheck);

#ifdef CONFIG_IPV6

EXPORT_SYMBOL(csum_ipv6_magic);

#endif



#ifdef CONFIG_VT

EXPORT_SYMBOL(screen_info);

#endif

arch/sh/lib64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#



# Panic should really be compiled as PIC

lib-y  := udelay.o c-checksum.o dbg.o panic.o memcpy.o memset.o \

lib-y  := udelay.o dbg.o panic.o memcpy.o memset.o \

	  copy_user_memcpy.o copy_page.o clear_page.o strcpy.o strlen.o



# Extracted from libgcc