From owner-svn-src-head@FreeBSD.ORG  Thu Jan  5 11:24:23 2012
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 F318F106566C;
	Thu,  5 Jan 2012 11:24:22 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DDF578FC08;
	Thu,  5 Jan 2012 11:24:22 +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 q05BOMwj032165;
	Thu, 5 Jan 2012 11:24:22 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q05BOMhf032163;
	Thu, 5 Jan 2012 11:24:22 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201201051124.q05BOMhf032163@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 5 Jan 2012 11:24:22 +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: r229586 - head/sys/net
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: Thu, 05 Jan 2012 11:24:23 -0000

Author: rwatson
Date: Thu Jan  5 11:24:22 2012
New Revision: 229586
URL: http://svn.freebsd.org/changeset/base/229586

Log:
  Add comment to the VLAN code about its integration with VIMAGE: we see what
  the code is doing, we recognise the legitimacy of its goal, but we're not
  quite sure it's going about it the right way.  More pondering is clearly
  required.
  
  Sponsored by:	ADARA Networks, Inc.
  Discussed with:	bz
  MFC after:	3 days

Modified:
  head/sys/net/if_vlan.c

Modified: head/sys/net/if_vlan.c
==============================================================================
--- head/sys/net/if_vlan.c	Thu Jan  5 11:16:42 2012	(r229585)
+++ head/sys/net/if_vlan.c	Thu Jan  5 11:24:22 2012	(r229586)
@@ -1597,6 +1597,13 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd
 
 	case SIOCSETVLAN:
 #ifdef VIMAGE
+		/*
+		 * XXXRW/XXXBZ: The goal in these checks is to allow a VLAN
+		 * interface to be delegated to a jail without allowing the
+		 * jail to change what underlying interface/VID it is
+		 * associated with.  We are not entirely convinced that this
+		 * is the right way to accomplish that goal policy goal.
+		 */
 		if (ifp->if_vnet != ifp->if_home_vnet) {
 			error = EPERM;
 			break;