git: 02a34c9198d2 - stable/12 - bridge: Support STP on VLAN devices

[Kristof Provost]

The branch stable/12 has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=02a34c9198d2d9c73150e4cae4910fe4af21a39c

commit 02a34c9198d2d9c73150e4cae4910fe4af21a39c
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-02-20 09:11:30 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
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. */