From owner-dev-commits-src-branches@freebsd.org Tue Mar 2 15:17:47 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6B8BF56C450; Tue, 2 Mar 2021 15:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dqgjl2cmqz4Wsh; Tue, 2 Mar 2021 15:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D0AB18EAF; Tue, 2 Mar 2021 15:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 122FHlhE039423; Tue, 2 Mar 2021 15:17:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 122FHlUF039422; Tue, 2 Mar 2021 15:17:47 GMT (envelope-from git) Date: Tue, 2 Mar 2021 15:17:47 GMT Message-Id: <202103021517.122FHlUF039422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 02a34c9198d2 - stable/12 - bridge: Support STP on VLAN devices MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 02a34c9198d2d9c73150e4cae4910fe4af21a39c Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2021 15:17:47 -0000 The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=02a34c9198d2d9c73150e4cae4910fe4af21a39c commit 02a34c9198d2d9c73150e4cae4910fe4af21a39c Author: Kristof Provost AuthorDate: 2021-02-20 09:11:30 +0000 Commit: Kristof Provost CommitDate: 2021-03-02 08:30:37 +0000 bridge: Support STP on VLAN devices VLAN devices have type IFT_L2VLAN, so the STP code mistakenly believed they couldn't be used for STP. That's not the case, so add the ITF_L2VLAN to the check. Reviewed by: donner@ MFC after: 1 week Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D28857 (cherry picked from commit 711ed156b94562c3dcb2ee9c1b3f240f960a75d2) --- sys/net/bridgestp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index d613051eb565..ed83a2d646f5 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -2232,6 +2232,7 @@ bstp_enable(struct bstp_port *bp) switch (ifp->if_type) { case IFT_ETHER: /* These can do spanning tree. */ + case IFT_L2VLAN: break; default: /* Nothing else can. */