From owner-svn-src-head@freebsd.org Sun Mar 27 10:09:11 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A85A8ADDEA5; Sun, 27 Mar 2016 10:09:11 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5EE6E132E; Sun, 27 Mar 2016 10:09:11 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2RA9ATR076346; Sun, 27 Mar 2016 10:09:10 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2RA9A5A076342; Sun, 27 Mar 2016 10:09:10 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201603271009.u2RA9A5A076342@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sun, 27 Mar 2016 10:09:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297313 - in head/sys: amd64/linux amd64/linux32 compat/linux i386/linux X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Mar 2016 10:09:11 -0000 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