Commit 8f3e3723 authored by David S. Miller's avatar David S. Miller

[NET]: Kill final traces of csum_partial_copy_fromuser.

parent 7b7408ba
...@@ -42,16 +42,10 @@ extern unsigned int csum_partial(const unsigned char * buff, int len, unsigned i ...@@ -42,16 +42,10 @@ extern unsigned int csum_partial(const unsigned char * buff, int len, unsigned i
* *
* 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
*/
unsigned int csum_partial_copy(const char *src, char *dst, int len, unsigned int sum);
/*
* the same as csum_partial, but copies from user space (but on the alpha
* we have just one address space, so this is identical to the above)
* *
* this is obsolete and will go away. * this will go away soon.
*/ */
#define csum_partial_copy_fromuser csum_partial_copy unsigned int csum_partial_copy(const char *src, char *dst, int len, unsigned int sum);
/* /*
* this is a new version of the above that records errors it finds in *errp, * this is a new version of the above that records errors it finds in *errp,
......
...@@ -38,10 +38,10 @@ unsigned int ...@@ -38,10 +38,10 @@ unsigned int
csum_partial_copy_from_user(const char *src, char *dst, int len, int sum, int *err_ptr); csum_partial_copy_from_user(const char *src, char *dst, int len, int sum, int *err_ptr);
/* /*
* These are the old (and unsafe) way of doing checksums, a warning message will be * This is the old (and unsafe) way of doing checksums, a warning message will
* printed if they are used and an exception occurs. * be printed if it is used and an exception occurs.
* *
* these functions should go away after some time. * this functions should go away after some time.
*/ */
#define csum_partial_copy(src,dst,len,sum) csum_partial_copy_nocheck(src,dst,len,sum) #define csum_partial_copy(src,dst,len,sum) csum_partial_copy_nocheck(src,dst,len,sum)
......
...@@ -50,13 +50,11 @@ unsigned int csum_partial_copy_from_user ( const char *src, char *dst, ...@@ -50,13 +50,11 @@ unsigned int csum_partial_copy_from_user ( const char *src, char *dst,
} }
/* /*
* These are the old (and unsafe) way of doing checksums, a warning message will be * This is the old (and unsafe) way of doing checksums, a warning message will
* printed if they are used and an exeption occurs. * be printed if it is used and an exeption occurs.
* *
* these functions should go away after some time. * this function should go away after some time.
*/ */
#define csum_partial_copy_fromuser csum_partial_copy
unsigned int csum_partial_copy( const char *src, char *dst, int len, int sum); unsigned int csum_partial_copy( const char *src, char *dst, int len, int sum);
/* /*
......
...@@ -48,19 +48,12 @@ extern unsigned int csum_partial (const unsigned char * buff, int len, ...@@ -48,19 +48,12 @@ extern unsigned int csum_partial (const unsigned char * buff, int len,
* *
* Here it is even more important to align src and dst on a 32-bit (or * Here it is even more important to align src and dst on a 32-bit (or
* even better 64-bit) boundary. * even better 64-bit) boundary.
*
* this will go away soon.
*/ */
extern unsigned int csum_partial_copy (const char *src, char *dst, int len, extern unsigned int csum_partial_copy (const char *src, char *dst, int len,
unsigned int sum); unsigned int sum);
/*
* The same as csum_partial, but copies from user space (but on the
* ia-64 we have just one address space, so this is identical to the
* above).
*
* This is obsolete and will go away.
*/
#define csum_partial_copy_fromuser csum_partial_copy
/* /*
* This is a new version of the above that records errors it finds in * This is a new version of the above that records errors it finds in
* *errp, but continues and zeros the rest of the buffer. * *errp, but continues and zeros the rest of the buffer.
......
...@@ -21,6 +21,8 @@ unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum) ...@@ -21,6 +21,8 @@ unsigned int csum_partial(const unsigned char * buff, int len, unsigned int 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
*
* this will go away soon.
*/ */
unsigned int csum_partial_copy(const char *src, char *dst, int len, int sum); unsigned int csum_partial_copy(const char *src, char *dst, int len, int sum);
......
...@@ -61,7 +61,6 @@ extern inline unsigned int csum_and_copy_to_user (const char *src, char *dst, ...@@ -61,7 +61,6 @@ extern inline unsigned int csum_and_copy_to_user (const char *src, char *dst,
* *
* this is obsolete and will go away. * this is obsolete and will go away.
*/ */
#define csum_partial_copy_fromuser csum_partial_copy
unsigned int csum_partial_copy(const char *src, char *dst, int len, unsigned int csum_partial_copy(const char *src, char *dst, int len,
unsigned int sum); unsigned int sum);
......
...@@ -63,7 +63,6 @@ extern inline unsigned int csum_and_copy_to_user (const char *src, char *dst, ...@@ -63,7 +63,6 @@ extern inline unsigned int csum_and_copy_to_user (const char *src, char *dst,
* *
* this is obsolete and will go away. * this is obsolete and will go away.
*/ */
#define csum_partial_copy_fromuser csum_partial_copy
unsigned int csum_partial_copy(const char *src, char *dst, int len, unsigned int csum_partial_copy(const char *src, char *dst, int len,
unsigned int sum); unsigned int sum);
......
...@@ -21,15 +21,10 @@ extern unsigned int csum_partial(const unsigned char *, int, unsigned int); ...@@ -21,15 +21,10 @@ extern unsigned int csum_partial(const unsigned char *, int, unsigned int);
* *
* 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 unsigned int csum_partial_copy(const char *, char *, int, unsigned int);
/*
* the same as csum_partial, but copies from user space
* *
* this is obsolete and will go away. * this will go away soon.
*/ */
#define csum_partial_copy_fromuser csum_partial_copy extern unsigned int csum_partial_copy(const char *, char *, int, unsigned int);
/* /*
* this is a new version of the above that records errors it finds in *errp, * this is a new version of the above that records errors it finds in *errp,
......
...@@ -39,12 +39,11 @@ extern unsigned int csum_partial_copy_generic(const char *src, char *dst, ...@@ -39,12 +39,11 @@ extern unsigned int csum_partial_copy_generic(const char *src, char *dst,
#define csum_partial_copy_nocheck(src, dst, len, sum) \ #define csum_partial_copy_nocheck(src, dst, len, sum) \
csum_partial_copy_generic((src), (dst), (len), (sum), 0, 0) csum_partial_copy_generic((src), (dst), (len), (sum), 0, 0)
/* /*
* Old versions which ignore errors. * Old version which ignore errors.
* it will go away soon.
*/ */
#define csum_partial_copy(src, dst, len, sum) \ #define csum_partial_copy(src, dst, len, sum) \
csum_partial_copy_generic((src), (dst), (len), (sum), 0, 0) csum_partial_copy_generic((src), (dst), (len), (sum), 0, 0)
#define csum_partial_copy_fromuser(src, dst, len, sum) \
csum_partial_copy_generic((src), (dst), (len), (sum), 0, 0)
/* /*
......
...@@ -43,6 +43,8 @@ extern unsigned int csum_partial(const unsigned char * buff, int len, ...@@ -43,6 +43,8 @@ extern unsigned int csum_partial(const unsigned char * buff, int len,
/* /*
* the same as csum_partial, but copies from src to dst while it * the same as csum_partial, but copies from src to dst while it
* checksums * checksums
*
* csum_partial_copy will go away soon.
*/ */
unsigned int csum_partial_copy(const char *src, char *dst, unsigned int csum_partial_copy(const char *src, char *dst,
int len, unsigned int sum); int len, unsigned int sum);
...@@ -51,15 +53,10 @@ extern unsigned int csum_partial_copy_generic(const char *src, char *dst, ...@@ -51,15 +53,10 @@ extern unsigned int csum_partial_copy_generic(const char *src, char *dst,
int len, unsigned int sum, int len, unsigned int sum,
int *src_err, int *dst_err); int *src_err, int *dst_err);
/* /*
* the same as csum_partial, but copies from user space. * the same as csum_partial, but copies from src to dst while it
* checksums.
*/ */
unsigned int csum_partial_copy_fromuser(const char *src,
char *dst,
int len,
unsigned int sum,
int *src_err);
unsigned int csum_partial_copy_nocheck(const char *src, unsigned int csum_partial_copy_nocheck(const char *src,
char *dst, char *dst,
int len, int len,
......
...@@ -67,6 +67,8 @@ csum_partial_inline(const unsigned char * buff, int len, unsigned int sum) ...@@ -67,6 +67,8 @@ csum_partial_inline(const unsigned char * buff, int len, unsigned int 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
*
* this will go away soon.
*/ */
static inline unsigned int static inline unsigned int
......
...@@ -69,6 +69,8 @@ csum_partial_inline(const unsigned char * buff, int len, unsigned int sum) ...@@ -69,6 +69,8 @@ csum_partial_inline(const unsigned char * buff, int len, unsigned int 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
*
* this will go away soon.
*/ */
static inline unsigned int static inline unsigned int
......
...@@ -58,13 +58,11 @@ unsigned int csum_partial_copy_from_user ( const char *src, char *dst, ...@@ -58,13 +58,11 @@ unsigned int csum_partial_copy_from_user ( const char *src, char *dst,
} }
/* /*
* These are the old (and unsafe) way of doing checksums, a warning message will be * This is the old (and unsafe) way of doing checksums, a warning message will
* printed if they are used and an exeption occurs. * be printed if it is used and an exeption occurs.
* *
* these functions should go away after some time. * this function should go away after some time.
*/ */
#define csum_partial_copy_fromuser csum_partial_copy
unsigned int csum_partial_copy( const char *src, char *dst, int len, int sum); unsigned int csum_partial_copy( const char *src, char *dst, int len, int sum);
/* /*
......
...@@ -40,11 +40,9 @@ extern unsigned int csum_partial(const unsigned char * buff, int len, unsigned i ...@@ -40,11 +40,9 @@ extern unsigned int csum_partial(const unsigned char * buff, int len, unsigned i
* better 64-bit) boundary * better 64-bit) boundary
*/ */
/* FIXME: Remove these two macros ASAP */ /* FIXME: Remove this macro ASAP */
#define csum_partial_copy(src, dst, len, sum) \ #define csum_partial_copy(src, dst, len, sum) \
csum_partial_copy_nocheck(src,dst,len,sum) csum_partial_copy_nocheck(src,dst,len,sum)
#define csum_partial_copy_fromuser(s, d, l, w) \
csum_partial_copy((char *) (s), (d), (l), (w))
extern unsigned int __csum_partial_copy_sparc_generic (const char *, char *); extern unsigned int __csum_partial_copy_sparc_generic (const char *, char *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment