From owner-svn-src-head@FreeBSD.ORG  Sun May  8 09:25:54 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7669A1065678;
	Sun,  8 May 2011 09:25:54 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 696AB8FC25;
	Sun,  8 May 2011 09:25:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p489PsPs038355;
	Sun, 8 May 2011 09:25:54 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p489PsFt038353;
	Sun, 8 May 2011 09:25:54 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201105080925.p489PsFt038353@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 8 May 2011 09:25:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221630 - head/sys/geom/eli
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 May 2011 09:25:54 -0000

Author: pjd
Date: Sun May  8 09:25:54 2011
New Revision: 221630
URL: http://svn.freebsd.org/changeset/base/221630

Log:
  Version 6 is compatible with version 5 when it comes to control commands.
  
  MFC after:	1 week

Modified:
  head/sys/geom/eli/g_eli_ctl.c

Modified: head/sys/geom/eli/g_eli_ctl.c
==============================================================================
--- head/sys/geom/eli/g_eli_ctl.c	Sun May  8 09:25:16 2011	(r221629)
+++ head/sys/geom/eli/g_eli_ctl.c	Sun May  8 09:25:54 2011	(r221630)
@@ -1014,7 +1014,12 @@ g_eli_config(struct gctl_req *req, struc
 		gctl_error(req, "No '%s' argument.", "version");
 		return;
 	}
-	if (*version != G_ELI_VERSION) {
+	while (*version != G_ELI_VERSION) {
+		if (G_ELI_VERSION == G_ELI_VERSION_06 &&
+		    *version == G_ELI_VERSION_05) {
+			/* Compatible. */
+			break;
+		}
 		gctl_error(req, "Userland and kernel parts are out of sync.");
 		return;
 	}