projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
inet.h
diff --git
a/include/linux/inet.h
b/include/linux/inet.h
index 6c5587af118d477354d7f738a688babd6524340f..4cca05c9678e760a07c0c8dcd88f73cc90ddfdc1 100644
(file)
--- a/
include/linux/inet.h
+++ b/
include/linux/inet.h
@@
-42,9
+42,16
@@
#ifndef _LINUX_INET_H
#define _LINUX_INET_H
#ifndef _LINUX_INET_H
#define _LINUX_INET_H
-#ifdef __KERNEL__
#include <linux/types.h>
#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 __be32 in_aton(const char *str);
-#endif
+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 /* _LINUX_INET_H */
#endif /* _LINUX_INET_H */