Merge ../linux-2.6-watchdog-mm

[linux-2.6-omap-h63xx.git] / include / linux / socket.h

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 36140909464983b8db555ac6423c463b1934c6e5..92cd38efad7fbca2429bbcb9453634abc4684bdd 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -264,6 +264,7 @@ struct ucred {
 #define SOL_IPV6       41
 #define SOL_ICMPV6     58
 #define SOL_SCTP       132
+#define SOL_UDPLITE    136     /* UDP-Lite (RFC 3828) */
 #define SOL_RAW                255
 #define SOL_IPX                256
 #define SOL_AX25       257
@@ -292,7 +293,7 @@ extern int memcpy_fromiovecend(unsigned char *kdata, struct iovec *iov,
 extern int csum_partial_copy_fromiovecend(unsigned char *kdata, 
                                          struct iovec *iov, 
                                          int offset, 
-                                         unsigned int len, int *csump);
+                                         unsigned int len, __wsum *csump);
 
 extern int verify_iovec(struct msghdr *m, struct iovec *iov, char *address, int mode);
 extern int memcpy_toiovec(struct iovec *v, unsigned char *kdata, int len);