Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 27 Mar 2016 08:12:02 +0000 (UTC)
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r297310 - in head/sys: amd64/linux amd64/linux32 compat/linux i386/linux
Message-ID:  <201603270812.u2R8C2x3043020@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dchagin
Date: Sun Mar 27 08:12:01 2016
New Revision: 297310
URL: https://svnweb.freebsd.org/changeset/base/297310

Log:
  iConvert Linux SOL_IPV6 level.
  
  MFC after:	1 week

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 08:10:20 2016	(r297309)
+++ head/sys/amd64/linux/linux.h	Sun Mar 27 08:12:01 2016	(r297310)
@@ -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

Modified: head/sys/amd64/linux32/linux.h
==============================================================================
--- head/sys/amd64/linux32/linux.h	Sun Mar 27 08:10:20 2016	(r297309)
+++ head/sys/amd64/linux32/linux.h	Sun Mar 27 08:12:01 2016	(r297310)
@@ -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

Modified: head/sys/compat/linux/linux_socket.c
==============================================================================
--- head/sys/compat/linux/linux_socket.c	Sun Mar 27 08:10:20 2016	(r297309)
+++ head/sys/compat/linux/linux_socket.c	Sun Mar 27 08:12:01 2016	(r297310)
@@ -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);
 }

Modified: head/sys/i386/linux/linux.h
==============================================================================
--- head/sys/i386/linux/linux.h	Sun Mar 27 08:10:20 2016	(r297309)
+++ head/sys/i386/linux/linux.h	Sun Mar 27 08:12:01 2016	(r297310)
@@ -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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603270812.u2R8C2x3043020>