svn commit: r297313 - in head/sys: amd64/linux amd64/linux32 compat/linux i386/linux

[Dmitry Chagin]

Author: dchagin
Date: Sun Mar 27 10:09:10 2016
New Revision: 297313
URL: https://svnweb.freebsd.org/changeset/base/297313

Log:
  Revert r297310 as the SOL_XXX are equal to the IPPROTO_XX except SOL_SOCKET.
  
  Pointed out by:	ae@

Modified:
  head/sys/amd64/linux/linux.h
  head/sys/amd64/linux32/linux.h
  head/sys/compat/linux/linux_socket.c
  head/sys/i386/linux/linux.h

Modified: head/sys/amd64/linux/linux.h
==============================================================================
--- head/sys/amd64/linux/linux.h	Sun Mar 27 10:04:25 2016	(r297312)
+++ head/sys/amd64/linux/linux.h	Sun Mar 27 10:09:10 2016	(r297313)
@@ -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

Modified: head/sys/amd64/linux32/linux.h
==============================================================================
--- head/sys/amd64/linux32/linux.h	Sun Mar 27 10:04:25 2016	(r297312)
+++ head/sys/amd64/linux32/linux.h	Sun Mar 27 10:09:10 2016	(r297313)
@@ -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

Modified: head/sys/compat/linux/linux_socket.c
==============================================================================
--- head/sys/compat/linux/linux_socket.c	Sun Mar 27 10:04:25 2016	(r297312)
+++ head/sys/compat/linux/linux_socket.c	Sun Mar 27 10:09:10 2016	(r297313)
@@ -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);
 }

Modified: head/sys/i386/linux/linux.h
==============================================================================
--- head/sys/i386/linux/linux.h	Sun Mar 27 10:04:25 2016	(r297312)
+++ head/sys/i386/linux/linux.h	Sun Mar 27 10:09:10 2016	(r297313)
@@ -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