Date: Fri, 17 Apr 2015 12:22:45 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281651 - projects/ifnet/sys/net Message-ID: <201504171222.t3HCMjIa040989@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Fri Apr 17 12:22:44 2015 New Revision: 281651 URL: https://svnweb.freebsd.org/changeset/base/281651 Log: Do not propagate SIOCSIFCAP on vlan(4) to parent, this leads to unexpected results. For more information see summary of https://reviews.freebsd.org/D2310. Modified: projects/ifnet/sys/net/if_vlan.c Modified: projects/ifnet/sys/net/if_vlan.c ============================================================================== --- projects/ifnet/sys/net/if_vlan.c Fri Apr 17 12:10:00 2015 (r281650) +++ projects/ifnet/sys/net/if_vlan.c Fri Apr 17 12:22:44 2015 (r281651) @@ -1642,26 +1642,6 @@ vlan_ioctl(if_t ifp, u_long cmd, void *d } break; - case SIOCSIFCAP: - VLAN_LOCK(); - if (TRUNK(ifv) != NULL) { - p = PARENT(ifv); - if ((if_type(p) != IFT_ETHER) && - (ifr->ifr_reqcap & IFCAP_VLAN_HWTAGGING) == 0) { - error = EINVAL; - break; - } - error = if_ioctl(p, cmd, data, td); - if (error) - break; - /* Propogate vlan interface capabilities */ - vlan_trunk_capabilities(p); - } else { - VLAN_UNLOCK(); - error = EINVAL; - } - break; - default: error = EOPNOTSUPP; break;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504171222.t3HCMjIa040989>