From nobody Sun Jan 30 20:40:29 2022 X-Original-To: dev-commits-src-branches@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 5628819930B3; Sun, 30 Jan 2022 20:40:30 +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 4Jn33y1jfrz4V9L; Sun, 30 Jan 2022 20:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643575230; 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=SZ2CPsOQ89rH8Vud0mWSNAVx11keoRpG33iNBKx+X9k=; b=UWzgc4N0Dt9zyOX08kF+4fD02CN8vsMrglV5euit3YfAVn53uGYQqj+rKKBYowQ9OVzO9X MpZeu4ndFaueiikoWawX476QrP8yOrSYPXrlqXqEXhazUBz7y0PyvHs8MBn1cmGQgs+xyP vpX7fWKys/IshLDwPWBGWQDRtLMMTfbQAqYIryKMBjXOqGrKXKM3KjKzkckRhy5CRinXCV Zien4TXT9ztuKqbI7THvzJDg0adw1IOSQtVpNDf230IF06NVUUL+uPQwety1xaSIplcprv 2Ut7HIE7G44Vtp96F0KWCnedsgVKV8MVJP2C7GsCjVxFmKuy8VkHzmWbgGoIAg== 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 0DF237723; Sun, 30 Jan 2022 20:40:30 +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 20UKeTrx024413; Sun, 30 Jan 2022 20:40:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20UKeTYW024412; Sun, 30 Jan 2022 20:40:29 GMT (envelope-from git) Date: Sun, 30 Jan 2022 20:40:29 GMT Message-Id: <202201302040.20UKeTYW024412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 8082242b96cb - stable/13 - igc: Remove redundant IFCAP_VLAN_HWTAGGING check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8082242b96cbd6be7b3c6cb2297ea2d3207185d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643575230; 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=SZ2CPsOQ89rH8Vud0mWSNAVx11keoRpG33iNBKx+X9k=; b=pvOf+XXK8sFTCpkcgUR4YBhuDKd6Um4JRh5UjFFsLz0yr+H8Xf7zRKUM3RbTzM3eOl2X7G Fh/wK43HfAkcG+KobendB9UtoX3wr+1GJ2D8myaOSddhSjO5ifx8fNuvm+ytabFj4+YzN7 74sfLsNff66NByUQfcMKTbqLjbN7yUaeCNXGROZAdQEKo2O5lVp/SqPPvHDvhSlcvDH4aW D6zp1u9RX/62mJD22/eW4Ksvt/e7miMRzz/AuyFM67x+JArV14t1FbQ41KGx1Ypzrh0s1N HdC14ILGSQrOCCQ91umhDNRpCXcMTS+lRx+vqgwr87GdDU6pAqE+owyVTdzhXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643575230; a=rsa-sha256; cv=none; b=i98wgl0zyGMunZbxv7xQTKqqfxxwb3l6IDpEnLQcWt6+PbMiShH7Xt7hWw8zBztY3yPNkM G6sQR7pmFDam4NeVdUoZkKmMC1hH3zI0qVO6T3mvXmwNHLcpTLTw20syUPvkSRXkb4GQOW Dn+mwbroeHaWlgypGyOgF4O/OsB8o3E6qEAfDCQEHiAp9HNPEt0Z1REg+cALweV3PpEIUm bz/bd6fb4reKBIq0TQUR2hbIM7plgZ8xCpIhnMqnz2D8o/oXijyBTlS4yvoSlnXKhKW0A/ pyWlKyQuPW5qsubmNPADsGcCm0f5vP6xXpTLVyU/gHIc0aD3s6O+AeAOgKrsLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=8082242b96cbd6be7b3c6cb2297ea2d3207185d9 commit 8082242b96cbd6be7b3c6cb2297ea2d3207185d9 Author: Kevin Bowling AuthorDate: 2021-12-29 16:37:34 +0000 Commit: Kevin Bowling CommitDate: 2022-01-30 20:40:02 +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; }