From nobody Wed Dec 29 16:44:59 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BD3C51921D0E; Wed, 29 Dec 2021 16:44:59 +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 4JPHLz3Szlz4cFr; Wed, 29 Dec 2021 16:44:59 +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 56F03597; Wed, 29 Dec 2021 16:44:59 +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 1BTGix5U080654; Wed, 29 Dec 2021 16:44:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BTGixhQ080653; Wed, 29 Dec 2021 16:44:59 GMT (envelope-from git) Date: Wed, 29 Dec 2021 16:44:59 GMT Message-Id: <202112291644.1BTGixhQ080653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: b4a58b3d5831 - main - igc: Remove redundant IFCAP_VLAN_HWTAGGING check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4a58b3d5831dd2e7e79d9d7cbc3e920803cb4f6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640796299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/om8prdrziCcxS/BsRAIxjNj68eYAA2TVjChaRPnpyc=; b=Vyjw0HH72sLd3nreKKkoiZrqbEn2KGkMVXh0K14msm1QH2Errdw2PHqadO6e+ZLoeMBJoQ NolmoXt4qb2SVWC0+LtOSo0KPww11OZg1rQdCacW+g5jpkwGW0dVC6SlfPY2ThJp0tF8qK rDrDYl7w6mutCPL8/PyCp5dslqcN/0/KctfuCfaYw9ArVsAH1YBiKOE2CyK7AfbMHdotoH 4uFeSyCTYoYeGBCoAM7m8dlBWzk+7DExCli/HIASc/dXjPrifWek0OfLnqNW4Fln5pwHUV 45pPVOpHASewD/JTn/HdZhKM42KTQ1HRNM9WLs46Z3vjWzUsbR9/5qL6TyB/Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640796299; a=rsa-sha256; cv=none; b=oRp+5S2U+T/5iCi0NGikvd/Qk6Igl+feZeyO9fvgrGUeJ9K8Tx60gRBLrqnu7zc1zwLHWX C6MF1TjedOn3nntd+nQh1ukdDnLZJCRZuw9BAt0WMwrkVpkTCmvNDECTP67nd4JiHzPoWO RovWszuyqM6elt53ULswWtDBffD+wD+3WqvGO7r/C3pkAo42jEbvdu1iWD+fRg7XUB4KMe z64rLa2riIZZce8K59F/8KOTnnw6S6/pP+3yBSK+B7riIqUhYKq3tyqjKcRcot9D5Ch5dU xMH6bHgesuyccSdEH4O4xHVN7NrBPoUfeYO5GVAprEKcJyhI/mlsYOGyA4nMNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=b4a58b3d5831dd2e7e79d9d7cbc3e920803cb4f6 commit b4a58b3d5831dd2e7e79d9d7cbc3e920803cb4f6 Author: Kevin Bowling AuthorDate: 2021-12-29 16:37:34 +0000 Commit: Kevin Bowling CommitDate: 2021-12-29 16:37:34 +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 MFC after: 1 month --- 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; }