From owner-svn-src-projects@FreeBSD.ORG  Tue Jan 13 07:38:30 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 A956B2EB;
 Tue, 13 Jan 2015 07:38:30 +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 9627C336;
 Tue, 13 Jan 2015 07:38:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0D7cUhn035289;
 Tue, 13 Jan 2015 07:38:30 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0D7cUXJ035288;
 Tue, 13 Jan 2015 07:38:30 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201501130738.t0D7cUXJ035288@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: Tue, 13 Jan 2015 07:38:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r277111 - projects/ifnet/sys/net
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2015 07:38:30 -0000

Author: glebius
Date: Tue Jan 13 07:38:29 2015
New Revision: 277111
URL: https://svnweb.freebsd.org/changeset/base/277111

Log:
  IF_CAPABILITIES shouldn't be modified after attach.

Modified:
  projects/ifnet/sys/net/if.c

Modified: projects/ifnet/sys/net/if.c
==============================================================================
--- projects/ifnet/sys/net/if.c	Tue Jan 13 07:35:30 2015	(r277110)
+++ projects/ifnet/sys/net/if.c	Tue Jan 13 07:38:29 2015	(r277111)
@@ -1550,21 +1550,6 @@ if_set_special(if_t ifp, ift_feature f)
 {
 
 	switch (f) {
-	case IF_CAPABILITIES:
-	{
-		uint64_t capabilities, capenable;
-		/*
-		 * If IF_CAPABILITIES have been reduced, then IF_CAPENABLE
-		 * should be reduced, too.
-		 */
-		capabilities = if_get(ifp, IF_CAPABILITIES);
-		capenable = if_get(ifp, IF_CAPENABLE);
-		if ((capenable & capabilities) != capenable) {
-			capenable &= capabilities;
-			if_set(ifp, IF_CAPENABLE, capenable);
-		}
-		break;
-	}
 	case IF_CAPENABLE:
 		/*
 		 * Modifying if_capenable may require extra actions, e.g.