svn commit: r281885 - head/sys/net

[Gleb Smirnoff]

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;