if_ethersubr.c: fix ether_8021q_frame to respect VHID from ether_vtag

freebsd · Jul 24, 2024 · 28896b2 · 28896b2
1 parent bb7f7d5
commit 28896b2
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
@@ -1405,7 +1405,7 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p,
 {
 	struct m_tag *mtag;
 	int n;
-	uint16_t tag;
+	uint16_t tag, vid = qtag->vid;
 	uint8_t pcp = qtag->pcp;
 	static const char pad[8];	/* just zeros */
 
@@ -1439,6 +1439,7 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p,
 	 * If PCP is set in mbuf, use it
 	 */
 	if ((*mp)->m_flags & M_VLANTAG) {
+		vid = EVL_VLANOFTAG((*mp)->m_pkthdr.ether_vtag);
 		pcp = EVL_PRIOFTAG((*mp)->m_pkthdr.ether_vtag);
 	}
 
@@ -1451,9 +1452,9 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p,
 	 */
 	if (V_vlan_mtag_pcp && (mtag = m_tag_locate(*mp, MTAG_8021Q,
 	    MTAG_8021Q_PCP_OUT, NULL)) != NULL)
-		tag = EVL_MAKETAG(qtag->vid, *(uint8_t *)(mtag + 1), 0);
+		tag = EVL_MAKETAG(vid, *(uint8_t *)(mtag + 1), 0);
 	else
-		tag = EVL_MAKETAG(qtag->vid, pcp, 0);
+		tag = EVL_MAKETAG(vid, pcp, 0);
 	if ((p->if_capenable & IFCAP_VLAN_HWTAGGING) &&
 	    (qtag->proto == ETHERTYPE_VLAN)) {
 		(*mp)->m_pkthdr.ether_vtag = tag;