summaryrefslogtreecommitdiffstats
path: root/include/linux/inet.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-18 10:14:56 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-18 10:14:56 +0200
commit48ae74443403ab25876959e84785f61bf421ccef (patch)
treedd6d8277f2f0e691edf49a38ff9a804f9a1532d0 /include/linux/inet.h
parent1b82c9666a6f637ccb3a86d0fbe23d0427076815 (diff)
parent5b664cb235e97afbf34db9c4d77f08ebd725335e (diff)
downloadkernel-crypto-48ae74443403ab25876959e84785f61bf421ccef.tar.gz
kernel-crypto-48ae74443403ab25876959e84785f61bf421ccef.tar.xz
kernel-crypto-48ae74443403ab25876959e84785f61bf421ccef.zip
Merge branch 'linus' into x86/step
Diffstat (limited to 'include/linux/inet.h')
-rw-r--r--include/linux/inet.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/inet.h b/include/linux/inet.h
index 1354080cf8c..4cca05c9678 100644
--- a/include/linux/inet.h
+++ b/include/linux/inet.h
@@ -44,6 +44,13 @@
#include <linux/types.h>
+/*
+ * These mimic similar macros defined in user-space for inet_ntop(3).
+ * See /usr/include/netinet/in.h .
+ */
+#define INET_ADDRSTRLEN (16)
+#define INET6_ADDRSTRLEN (48)
+
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);