git: b02fa10699b2 - stable/12 - igc: Remove redundant IFCAP_VLAN_HWTAGGING check

The branch stable/12 has been updated by kbowling (ports committer):

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

commit b02fa10699b28b81d35475d23b9812fb15d7e2cb
Author:     Kevin Bowling <kbowling@FreeBSD.org>
AuthorDate: 2021-12-29 16:37:34 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2022-01-30 20:42:28 +0000

    igc: Remove redundant IFCAP_VLAN_HWTAGGING check
    
    Match igb(4) as in f7926a6d0c10. From Vincenzo, this check is redundant
    to setup providing us an IGC_RXD_STAT_VP bit and would make for an
    unexpected condition if IFCAP_VLAN_HWTAGGING were not set but the tag
    was stripped, which would be passed up the stack breaking isolation.
    
    PR:             260068
    Approved by:    vmaffione
    
    (cherry picked from commit b4a58b3d5831dd2e7e79d9d7cbc3e920803cb4f6)
---
 sys/dev/igc/igc_txrx.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys/dev/igc/igc_txrx.c b/sys/dev/igc/igc_txrx.c
index 4f8234c855f6..2b441da098e0 100644
--- a/sys/dev/igc/igc_txrx.c
+++ b/sys/dev/igc/igc_txrx.c
@@ -513,8 +513,7 @@ igc_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri)
 	if ((scctx->isc_capenable & IFCAP_RXCSUM) != 0)
 		igc_rx_checksum(staterr, ri, ptype);
 
-	if ((scctx->isc_capenable & IFCAP_VLAN_HWTAGGING) != 0 &&
-	    (staterr & IGC_RXD_STAT_VP) != 0) {
+	if (staterr & IGC_RXD_STAT_VP) {
 		ri->iri_vtag = le16toh(rxd->wb.upper.vlan);
 		ri->iri_flags |= M_VLANTAG;
 	}