Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: Shut up csum_ipv6_magic() warnings.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

+34 -35
+34 -35
include/asm-sh/checksum.h
··· 34 34 */ 35 35 36 36 asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst, 37 - int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); 37 + int len, __wsum sum, 38 + int *src_err_ptr, int *dst_err_ptr); 38 39 39 40 /* 40 41 * Note: when you get a NULL pointer exception here this means someone 41 - * passed in an incorrect kernel address to one of these functions. 42 - * 43 - * If you use these functions directly please don't forget the 42 + * passed in an incorrect kernel address to one of these functions. 43 + * 44 + * If you use these functions directly please don't forget the 44 45 * access_ok(). 45 46 */ 46 - static __inline__ 47 + static inline 47 48 __wsum csum_partial_copy_nocheck(const void *src, void *dst, 48 - int len, __wsum sum) 49 + int len, __wsum sum) 49 50 { 50 - return csum_partial_copy_generic ( src, dst, len, sum, NULL, NULL); 51 + return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL); 51 52 } 52 53 53 - static __inline__ 54 + static inline 54 55 __wsum csum_partial_copy_from_user(const void __user *src, void *dst, 55 - int len, __wsum sum, int *err_ptr) 56 + int len, __wsum sum, int *err_ptr) 56 57 { 57 58 return csum_partial_copy_generic((__force const void *)src, dst, 58 59 len, sum, err_ptr, NULL); ··· 63 62 * Fold a partial checksum 64 63 */ 65 64 66 - static __inline__ __sum16 csum_fold(__wsum sum) 65 + static inline __sum16 csum_fold(__wsum sum) 67 66 { 68 67 unsigned int __dummy; 69 68 __asm__("swap.w %0, %1\n\t" ··· 86 85 * i386 version by Jorge Cwik <jorge@laser.satlink.net>, adapted 87 86 * for linux by * Arnt Gulbrandsen. 88 87 */ 89 - static __inline__ __sum16 ip_fast_csum(const void *iph, unsigned int ihl) 88 + static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) 90 89 { 91 90 unsigned int sum, __dummy0, __dummy1; 92 91 ··· 114 113 return csum_fold(sum); 115 114 } 116 115 117 - static __inline__ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, 118 - unsigned short len, 119 - unsigned short proto, 120 - __wsum sum) 116 + static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, 117 + unsigned short len, 118 + unsigned short proto, 119 + __wsum sum) 121 120 { 122 121 #ifdef __LITTLE_ENDIAN__ 123 122 unsigned long len_proto = (proto + len) << 8; ··· 133 132 : "=r" (sum), "=r" (len_proto) 134 133 : "r" (daddr), "r" (saddr), "1" (len_proto), "0" (sum) 135 134 : "t"); 135 + 136 136 return sum; 137 137 } 138 138 ··· 141 139 * computes the checksum of the TCP/UDP pseudo-header 142 140 * returns a 16-bit checksum, already complemented 143 141 */ 144 - static __inline__ __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, 145 - unsigned short len, 146 - unsigned short proto, 147 - __wsum sum) 142 + static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, 143 + unsigned short len, 144 + unsigned short proto, 145 + __wsum sum) 148 146 { 149 - return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum)); 147 + return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum)); 150 148 } 151 149 152 150 /* 153 151 * this routine is used for miscellaneous IP-like checksums, mainly 154 152 * in icmp.c 155 153 */ 156 - 157 - static __inline__ __sum16 ip_compute_csum(const void *buff, int len) 154 + static inline __sum16 ip_compute_csum(const void *buff, int len) 158 155 { 159 - return csum_fold (csum_partial(buff, len, 0)); 156 + return csum_fold(csum_partial(buff, len, 0)); 160 157 } 161 158 162 159 #define _HAVE_ARCH_IPV6_CSUM 163 - #ifdef CONFIG_IPV6 164 - static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, 165 - const struct in6_addr *daddr, 166 - __u32 len, unsigned short proto, 167 - __wsum sum) 160 + static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr, 161 + const struct in6_addr *daddr, 162 + __u32 len, unsigned short proto, 163 + __wsum sum) 168 164 { 169 165 unsigned int __dummy; 170 166 __asm__("clrt\n\t" ··· 187 187 "movt %1\n\t" 188 188 "add %1, %0\n" 189 189 : "=r" (sum), "=&r" (__dummy) 190 - : "r" (saddr), "r" (daddr), 190 + : "r" (saddr), "r" (daddr), 191 191 "r" (htonl(len)), "r" (htonl(proto)), "0" (sum) 192 192 : "t"); 193 193 194 194 return csum_fold(sum); 195 195 } 196 - #endif 197 196 198 - /* 197 + /* 199 198 * Copy and checksum to user 200 199 */ 201 200 #define HAVE_CSUM_COPY_USER 202 - static __inline__ __wsum csum_and_copy_to_user (const void *src, 203 - void __user *dst, 204 - int len, __wsum sum, 205 - int *err_ptr) 201 + static inline __wsum csum_and_copy_to_user(const void *src, 202 + void __user *dst, 203 + int len, __wsum sum, 204 + int *err_ptr) 206 205 { 207 206 if (access_ok(VERIFY_WRITE, dst, len)) 208 207 return csum_partial_copy_generic((__force const void *)src,