svn commit: r193580 - in stable/7/sys: . amd64/linux32 compat/linux
contrib/pf dev/ath/ath_hal dev/cxgb i386/linux
Dmitry Chagin
dchagin at FreeBSD.org
Sat Jun 6 10:55:12 UTC 2009
Author: dchagin
Date: Sat Jun 6 10:55:11 2009
New Revision: 193580
URL: http://svn.freebsd.org/changeset/base/193580
Log:
MFC r191876:
To avoid excessive code duplication move MI definitions to the MI
header file. As it is defined in Linux.
Approved by: kib (mentor)
Modified:
stable/7/sys/ (props changed)
stable/7/sys/amd64/linux32/linux.h
stable/7/sys/compat/linux/linux_ioctl.c
stable/7/sys/compat/linux/linux_socket.h
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/i386/linux/linux.h
Modified: stable/7/sys/amd64/linux32/linux.h
==============================================================================
--- stable/7/sys/amd64/linux32/linux.h Sat Jun 6 09:37:55 2009 (r193579)
+++ stable/7/sys/amd64/linux32/linux.h Sat Jun 6 10:55:11 2009 (r193580)
@@ -663,14 +663,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
Modified: stable/7/sys/compat/linux/linux_ioctl.c
==============================================================================
--- stable/7/sys/compat/linux/linux_ioctl.c Sat Jun 6 09:37:55 2009 (r193579)
+++ stable/7/sys/compat/linux/linux_ioctl.c Sat Jun 6 10:55:11 2009 (r193580)
@@ -72,6 +72,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);
Modified: stable/7/sys/compat/linux/linux_socket.h
==============================================================================
--- stable/7/sys/compat/linux/linux_socket.h Sat Jun 6 09:37:55 2009 (r193579)
+++ stable/7/sys/compat/linux/linux_socket.h Sat Jun 6 10:55:11 2009 (r193580)
@@ -49,4 +49,14 @@
#define LINUX_MSG_ERRQUEUE 0x2000
#define LINUX_MSG_NOSIGNAL 0x4000
+/* 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_ */
Modified: stable/7/sys/i386/linux/linux.h
==============================================================================
--- stable/7/sys/i386/linux/linux.h Sat Jun 6 09:37:55 2009 (r193579)
+++ stable/7/sys/i386/linux/linux.h Sat Jun 6 10:55:11 2009 (r193580)
@@ -634,14 +634,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
More information about the svn-src-stable-7
mailing list