diff options
| author | dchagin <dchagin@FreeBSD.org> | 2016-03-27 10:09:10 +0000 |
|---|---|---|
| committer | dchagin <dchagin@FreeBSD.org> | 2016-03-27 10:09:10 +0000 |
| commit | a5f7ea1073b23d713cd4d9aa792ec74bec75a3f7 (patch) | |
| tree | 47fe0fd423c3d254afdb28e4edb65af65f441aed | |
| parent | 1af093855e8096be9c0bc4ad5d014c7e3456bcca (diff) | |
| download | FreeBSD-src-a5f7ea1073b23d713cd4d9aa792ec74bec75a3f7.zip FreeBSD-src-a5f7ea1073b23d713cd4d9aa792ec74bec75a3f7.tar.gz | |
Revert r297310 as the SOL_XXX are equal to the IPPROTO_XX except SOL_SOCKET.
Pointed out by: ae@
| -rw-r--r-- | sys/amd64/linux/linux.h | 1 | ||||
| -rw-r--r-- | sys/amd64/linux32/linux.h | 1 | ||||
| -rw-r--r-- | sys/compat/linux/linux_socket.c | 2 | ||||
| -rw-r--r-- | sys/i386/linux/linux.h | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h index 0859cdb..639499a 100644 --- a/sys/amd64/linux/linux.h +++ b/sys/amd64/linux/linux.h @@ -404,7 +404,6 @@ 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 464a9b2..02d12f5 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -494,7 +494,6 @@ 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 28def4a..741a45b 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -246,8 +246,6 @@ 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 636bfaf..36b2084 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -473,7 +473,6 @@ 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 |
