aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Chagin <dchagin@FreeBSD.org>2009-05-07 09:39:20 +0000
committerDmitry Chagin <dchagin@FreeBSD.org>2009-05-07 09:39:20 +0000
commit13f20d7e8607cbd09df8ec9f82eaea86874e4af2 (patch)
tree82b0d56bc6e82df7b55b5e78b1f0d0d762bd01ec
parentd9b063cc9d455f3952902a07db64d8d20e0a8302 (diff)
downloadsrc-13f20d7e8607cbd09df8ec9f82eaea86874e4af2.tar.gz
src-13f20d7e8607cbd09df8ec9f82eaea86874e4af2.zip
To avoid excessive code duplication move MI definitions to the MI
header file. As it is defined in Linux. Approved by: kib (mentor) MFC after: 1 month
Notes
Notes: svn path=/head/; revision=191876
-rw-r--r--sys/amd64/linux32/linux.h8
-rw-r--r--sys/compat/linux/linux_ioctl.c1
-rw-r--r--sys/compat/linux/linux_socket.h10
-rw-r--r--sys/i386/linux/linux.h8
4 files changed, 11 insertions, 16 deletions
diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h
index 0e30382f94b4..78abf63f38a7 100644
--- a/sys/amd64/linux32/linux.h
+++ b/sys/amd64/linux32/linux.h
@@ -669,14 +669,6 @@ union l_semun {
#define LINUX_SENDMSG 16
#define LINUX_RECVMSG 17
-#define LINUX_AF_UNSPEC 0
-#define LINUX_AF_UNIX 1
-#define LINUX_AF_INET 2
-#define LINUX_AF_AX25 3
-#define LINUX_AF_IPX 4
-#define LINUX_AF_APPLETALK 5
-#define LINUX_AF_INET6 10
-
#define LINUX_SOL_SOCKET 1
#define LINUX_SOL_IP 0
#define LINUX_SOL_IPX 256
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 55cf1b9f32e6..2b4ca75834f2 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -77,6 +77,7 @@ __FBSDID("$FreeBSD$");
#include <compat/linux/linux_ioctl.h>
#include <compat/linux/linux_mib.h>
+#include <compat/linux/linux_socket.h>
#include <compat/linux/linux_util.h>
CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ);
diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h
index 5a5d3f5c78de..9257a7db593c 100644
--- a/sys/compat/linux/linux_socket.h
+++ b/sys/compat/linux/linux_socket.h
@@ -80,4 +80,14 @@
#define CMSG_HDRSZ CMSG_LEN(0)
#define L_CMSG_HDRSZ LINUX_CMSG_LEN(0)
+/* Supported address families */
+
+#define LINUX_AF_UNSPEC 0
+#define LINUX_AF_UNIX 1
+#define LINUX_AF_INET 2
+#define LINUX_AF_AX25 3
+#define LINUX_AF_IPX 4
+#define LINUX_AF_APPLETALK 5
+#define LINUX_AF_INET6 10
+
#endif /* _LINUX_SOCKET_H_ */
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index ca01c894a375..132e431a6009 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -645,14 +645,6 @@ union l_semun {
#define LINUX_SENDMSG 16
#define LINUX_RECVMSG 17
-#define LINUX_AF_UNSPEC 0
-#define LINUX_AF_UNIX 1
-#define LINUX_AF_INET 2
-#define LINUX_AF_AX25 3
-#define LINUX_AF_IPX 4
-#define LINUX_AF_APPLETALK 5
-#define LINUX_AF_INET6 10
-
#define LINUX_SOL_SOCKET 1
#define LINUX_SOL_IP 0
#define LINUX_SOL_IPX 256