From owner-svn-src-all@FreeBSD.ORG  Thu Apr 23 13:19:01 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 37F8B9B0;
 Thu, 23 Apr 2015 13:19:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 268C01B79;
 Thu, 23 Apr 2015 13:19:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3NDJ1FC060061;
 Thu, 23 Apr 2015 13:19:01 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3NDJ1tW060060;
 Thu, 23 Apr 2015 13:19:01 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201504231319.t3NDJ1tW060060@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 23 Apr 2015 13:19:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281885 - head/sys/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Apr 2015 13:19:01 -0000

Author: glebius
Date: Thu Apr 23 13:19:00 2015
New Revision: 281885
URL: https://svnweb.freebsd.org/changeset/base/281885

Log:
  Don't propagate SIOCSIFCAPS from a vlan(4) to its parent. This leads to
  quite unexpected result of toggling capabilities on the neighbour vlan(4)
  interfaces.
  
  Reviewed by:		melifaro, np
  Differential Revision:	https://reviews.freebsd.org/D2310
  Sponsored by:		Nginx, Inc.

Modified:
  head/sys/net/if_vlan.c

Modified: head/sys/net/if_vlan.c
==============================================================================
--- head/sys/net/if_vlan.c	Thu Apr 23 13:10:03 2015	(r281884)
+++ head/sys/net/if_vlan.c	Thu Apr 23 13:19:00 2015	(r281885)
@@ -1705,27 +1705,6 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd
 		}
 		break;
 
-	case SIOCSIFCAP:
-		VLAN_LOCK();
-		if (TRUNK(ifv) != NULL) {
-			p = PARENT(ifv);
-			VLAN_UNLOCK();
-			if ((p->if_type != IFT_ETHER) &&
-			    (ifr->ifr_reqcap & IFCAP_VLAN_HWTAGGING) == 0) {
-				error = EINVAL;
-				break;
-			}
-			error = (*p->if_ioctl)(p, cmd, data);
-			if (error)
-				break;
-			/* Propogate vlan interface capabilities */
-			vlan_trunk_capabilities(p);
-		} else {
-			VLAN_UNLOCK();
-			error = EINVAL;
-		}
-		break;
-
 	default:
 		error = EINVAL;
 		break;