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

Commit b482ad5d authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Shut up csum_ipv6_magic() warnings. 



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

include/asm-sh/checksum.h

+34 −35
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ asmlinkage __wsum csum_partial(const void *buff, int len, __wsum sum); 
 */



asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,

					  int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr);

					    int len, __wsum sum,

					    int *src_err_ptr, int *dst_err_ptr);



/*

 *	Note: when you get a NULL pointer exception here this means someone
@@ -43,14 +44,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst, 
 *	If you use these functions directly please don't forget the

 *	access_ok().

 */

static __inline__

static inline

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

				 int len, __wsum sum)

{

	return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL);

}



static __inline__

static inline

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

				   int len, __wsum sum, int *err_ptr)

{
@@ -62,7 +63,7 @@ __wsum csum_partial_copy_from_user(const void __user *src, void *dst, 
 *	Fold a partial checksum

 */



static __inline__ __sum16 csum_fold(__wsum sum)

static inline __sum16 csum_fold(__wsum sum)

{

	unsigned int __dummy;

	__asm__("swap.w %0, %1\n\t"
@@ -85,7 +86,7 @@ static __inline__ __sum16 csum_fold(__wsum sum) 
 *      i386 version by Jorge Cwik <jorge@laser.satlink.net>, adapted

 *      for linux by * Arnt Gulbrandsen.

 */

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

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

{

	unsigned int sum, __dummy0, __dummy1;
@@ -113,7 +114,7 @@ static __inline__ __sum16 ip_fast_csum(const void *iph, unsigned int ihl) 
	return	csum_fold(sum);

}



static __inline__ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,

static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,

					unsigned short len,

					unsigned short proto,

					__wsum sum)
@@ -132,6 +133,7 @@ static __inline__ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, 
		: "=r" (sum), "=r" (len_proto)

		: "r" (daddr), "r" (saddr), "1" (len_proto), "0" (sum)

		: "t");



	return sum;

}
@@ -139,7 +141,7 @@ static __inline__ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, 
 * 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,

static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,

					unsigned short len,

					unsigned short proto,

					__wsum sum)
@@ -151,15 +153,13 @@ static __inline__ __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, 
 * this routine is used for miscellaneous IP-like checksums, mainly

 * in icmp.c

 */



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

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

{

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

}



#define _HAVE_ARCH_IPV6_CSUM

#ifdef CONFIG_IPV6

static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,

static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr,

				      const struct in6_addr *daddr,

				      __u32 len, unsigned short proto,

				      __wsum sum)
@@ -193,13 +193,12 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, 


	return csum_fold(sum);

}

#endif



/*

 *	Copy and checksum to user

 */

#define HAVE_CSUM_COPY_USER

static __inline__ __wsum csum_and_copy_to_user (const void *src,

static inline __wsum csum_and_copy_to_user(const void *src,

					   void __user *dst,

					   int len, __wsum sum,

					   int *err_ptr)