From 22c1ebea2165a7ab10a96ecfa28eeadff62b87e2 Mon Sep 17 00:00:00 2001 From: dchagin Date: Sun, 27 Mar 2016 08:12:01 +0000 Subject: iConvert Linux SOL_IPV6 level. MFC after: 1 week --- sys/amd64/linux/linux.h | 1 + sys/amd64/linux32/linux.h | 1 + sys/compat/linux/linux_socket.c | 2 ++ sys/i386/linux/linux.h | 1 + 4 files changed, 5 insertions(+) diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h index 639499a..0859cdb 100644 --- a/sys/amd64/linux/linux.h +++ b/sys/amd64/linux/linux.h @@ -404,6 +404,7 @@ struct l_ipc_perm { #define LINUX_SOL_SOCKET 1 #define LINUX_SOL_IP 0 +#define LINUX_SOL_IPV6 41 #define LINUX_SOL_IPX 256 #define LINUX_SOL_AX25 257 #define LINUX_SOL_TCP 6 diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index 02d12f5..464a9b2 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -494,6 +494,7 @@ struct l_ipc_perm { */ #define LINUX_SOL_SOCKET 1 #define LINUX_SOL_IP 0 +#define LINUX_SOL_IPV6 41 #define LINUX_SOL_IPX 256 #define LINUX_SOL_AX25 257 #define LINUX_SOL_TCP 6 diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 741a45b..28def4a 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -246,6 +246,8 @@ linux_to_bsd_sockopt_level(int level) switch (level) { case LINUX_SOL_SOCKET: return (SOL_SOCKET); + case LINUX_SOL_IPV6: + return (IPPROTO_IPV6); } return (level); } diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 36b2084..636bfaf 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -473,6 +473,7 @@ struct l_ipc_perm { */ #define LINUX_SOL_SOCKET 1 #define LINUX_SOL_IP 0 +#define LINUX_SOL_IPV6 41 #define LINUX_SOL_IPX 256 #define LINUX_SOL_AX25 257 #define LINUX_SOL_TCP 6 -- cgit v1.1