Commit f1bfd71c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

arch, net: remove the last csum_partial_copy() leftovers 



Most of the tree only uses and implements csum_partial_copy_nocheck,
but the c6x and lib/checksum.c implement a csum_partial_copy that
isn't used anywere except to define csum_partial_copy.  Get rid of
this pointless alias.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cebd2cac

arch/c6x/lib/checksum.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,6 +6,6 @@ 




/* These are from csum_64plus.S */

/* These are from csum_64plus.S */

EXPORT_SYMBOL(csum_partial);

EXPORT_SYMBOL(csum_partial);

EXPORT_SYMBOL(csum_partial_copy);

EXPORT_SYMBOL(csum_partial_copy_nocheck);

EXPORT_SYMBOL(ip_compute_csum);

EXPORT_SYMBOL(ip_compute_csum);

EXPORT_SYMBOL(ip_fast_csum);
 
EXPORT_SYMBOL(ip_fast_csum);

arch/c6x/lib/csum_64plus.S

+4 −4
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/linkage.h>

#include <linux/linkage.h>





;

;

;unsigned int csum_partial_copy(const char *src, char * dst,

;unsigned int csum_partial_copy_nocheck(const char *src, char * dst,

;					int len, int sum)

;					int len, int sum)

;

;

; A4:	src

; A4:	src
@@ -21,7 +21,7 @@ 
;

;





	.text

	.text

ENTRY(csum_partial_copy)

ENTRY(csum_partial_copy_nocheck)

	MVC	.S2	ILC,B30

	MVC	.S2	ILC,B30





	MV	.D1X	B6,A31		; given csum

	MV	.D1X	B6,A31		; given csum
@@ -149,7 +149,7 @@ L10: ADD .D1 A31,A9,A9 




	BNOP	.S2	B3,4

	BNOP	.S2	B3,4

	MVC	.S2	B30,ILC

	MVC	.S2	B30,ILC

ENDPROC(csum_partial_copy)

ENDPROC(csum_partial_copy_nocheck)





;

;

;unsigned short

;unsigned short

arch/nios2/include/asm/checksum.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -12,10 +12,9 @@ 




/* Take these from lib/checksum.c */

/* Take these from lib/checksum.c */

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

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

extern __wsum csum_partial_copy(const void *src, void *dst, int len,

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

				__wsum sum);

				__wsum sum);

#define csum_partial_copy_nocheck(src, dst, len, sum)	\

#define csum_partial_copy_nocheck csum_partial_copy_nocheck

	csum_partial_copy((src), (dst), (len), (sum))





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

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

extern __sum16 ip_compute_csum(const void *buff, int len);

extern __sum16 ip_compute_csum(const void *buff, int len);

include/asm-generic/checksum.h

+2 −4
Original line number Original line Diff line number Diff line
@@ -23,11 +23,9 @@ extern __wsum csum_partial(const void *buff, int len, __wsum sum); 
 * here even more important to align src and dst on a 32-bit (or even

 * here even more important to align src and dst on a 32-bit (or even

 * better 64-bit) boundary

 * better 64-bit) boundary

 */

 */

extern __wsum csum_partial_copy(const void *src, void *dst, int len, __wsum sum);



#ifndef csum_partial_copy_nocheck

#ifndef csum_partial_copy_nocheck

#define csum_partial_copy_nocheck(src, dst, len, sum)	\

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

	csum_partial_copy((src), (dst), (len), (sum))

		__wsum sum);

#endif

#endif





#ifndef ip_fast_csum

#ifndef ip_fast_csum

lib/checksum.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -149,12 +149,12 @@ EXPORT_SYMBOL(ip_compute_csum); 
 * copy from ds while checksumming, otherwise like csum_partial

 * copy from ds while checksumming, otherwise like csum_partial

 */

 */

__wsum

__wsum

csum_partial_copy(const void *src, void *dst, int len, __wsum sum)

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

{

{

	memcpy(dst, src, len);

	memcpy(dst, src, len);

	return csum_partial(dst, len, sum);

	return csum_partial(dst, len, sum);

}

}

EXPORT_SYMBOL(csum_partial_copy);

EXPORT_SYMBOL(csum_partial_copy_nocheck);





#ifndef csum_tcpudp_nofold

#ifndef csum_tcpudp_nofold

static inline u32 from64to32(u64 x)

static inline u32 from64to32(u64 x)