svn commit: r293587 - in stable/10/sys: amd64/linux amd64/linux32 compat/linux i386/linux
Dmitry Chagin
dchagin at FreeBSD.org
Sat Jan 9 17:49:07 UTC 2016
Author: dchagin
Date: Sat Jan 9 17:49:05 2016
New Revision: 293587
URL: https://svnweb.freebsd.org/changeset/base/293587
Log:
MFC r283487:
Reduce duplication between MD Linux code by moving msg related
struct definitions out into the compat/linux/linux_socket.h
Modified:
stable/10/sys/amd64/linux/linux.h
stable/10/sys/amd64/linux32/linux.h
stable/10/sys/compat/linux/linux_socket.h
stable/10/sys/i386/linux/linux.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/amd64/linux/linux.h
==============================================================================
--- stable/10/sys/amd64/linux/linux.h Sat Jan 9 17:47:57 2016 (r293586)
+++ stable/10/sys/amd64/linux/linux.h Sat Jan 9 17:49:05 2016 (r293587)
@@ -447,22 +447,6 @@ struct l_sockaddr {
char sa_data[14];
};
-struct l_msghdr {
- l_uintptr_t msg_name;
- l_int msg_namelen;
- l_uintptr_t msg_iov;
- l_size_t msg_iovlen;
- l_uintptr_t msg_control;
- l_size_t msg_controllen;
- l_uint msg_flags;
-};
-
-struct l_cmsghdr {
- l_size_t cmsg_len;
- l_int cmsg_level;
- l_int cmsg_type;
-};
-
struct l_ifmap {
l_ulong mem_start;
l_ulong mem_end;
Modified: stable/10/sys/amd64/linux32/linux.h
==============================================================================
--- stable/10/sys/amd64/linux32/linux.h Sat Jan 9 17:47:57 2016 (r293586)
+++ stable/10/sys/amd64/linux32/linux.h Sat Jan 9 17:49:05 2016 (r293587)
@@ -525,22 +525,6 @@ struct l_sockaddr {
char sa_data[14];
} __packed;
-struct l_msghdr {
- l_uintptr_t msg_name;
- l_int msg_namelen;
- l_uintptr_t msg_iov;
- l_size_t msg_iovlen;
- l_uintptr_t msg_control;
- l_size_t msg_controllen;
- l_uint msg_flags;
-};
-
-struct l_cmsghdr {
- l_size_t cmsg_len;
- l_int cmsg_level;
- l_int cmsg_type;
-};
-
struct l_ifmap {
l_ulong mem_start;
l_ulong mem_end;
Modified: stable/10/sys/compat/linux/linux_socket.h
==============================================================================
--- stable/10/sys/compat/linux/linux_socket.h Sat Jan 9 17:47:57 2016 (r293586)
+++ stable/10/sys/compat/linux/linux_socket.h Sat Jan 9 17:49:05 2016 (r293587)
@@ -55,6 +55,22 @@
#define LINUX_SCM_RIGHTS 0x01
#define LINUX_SCM_CREDENTIALS 0x02
+struct l_msghdr {
+ l_uintptr_t msg_name;
+ l_int msg_namelen;
+ l_uintptr_t msg_iov;
+ l_size_t msg_iovlen;
+ l_uintptr_t msg_control;
+ l_size_t msg_controllen;
+ l_uint msg_flags;
+};
+
+struct l_cmsghdr {
+ l_size_t cmsg_len;
+ l_int cmsg_level;
+ l_int cmsg_type;
+};
+
/* Ancilliary data object information macros */
#define LINUX_CMSG_ALIGN(len) roundup2(len, sizeof(l_ulong))
Modified: stable/10/sys/i386/linux/linux.h
==============================================================================
--- stable/10/sys/i386/linux/linux.h Sat Jan 9 17:47:57 2016 (r293586)
+++ stable/10/sys/i386/linux/linux.h Sat Jan 9 17:49:05 2016 (r293587)
@@ -504,22 +504,6 @@ struct l_sockaddr {
char sa_data[14];
};
-struct l_msghdr {
- l_uintptr_t msg_name;
- l_int msg_namelen;
- l_uintptr_t msg_iov;
- l_size_t msg_iovlen;
- l_uintptr_t msg_control;
- l_size_t msg_controllen;
- l_uint msg_flags;
-};
-
-struct l_cmsghdr {
- l_size_t cmsg_len;
- l_int cmsg_level;
- l_int cmsg_type;
-};
-
struct l_ifmap {
l_ulong mem_start;
l_ulong mem_end;
More information about the svn-src-stable
mailing list