Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / include / linux / inet.h

diff --git a/include/linux/inet.h b/include/linux/inet.h
index af4fa41..675a7db 100644 (file)
--- a/include/linux/inet.h
+++ b/include/linux/inet.h
@@ -43,6 +43,10 @@
 #define _LINUX_INET_H
 
 #ifdef __KERNEL__
-extern __u32 in_aton(const char *str);
+#include <linux/types.h>
+
+extern __be32 in_aton(const char *str);
+extern int in4_pton(const char *src, int srclen, u8 *dst, int delim, const char **end);
+extern int in6_pton(const char *src, int srclen, u8 *dst, int delim, const char **end);
 #endif
 #endif /* _LINUX_INET_H */