From nobody Sun Jan 30 20:42:39 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 7AE651994134; Sun, 30 Jan 2022 20:42:39 +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 4Jn36R2ynMz4Wcp; Sun, 30 Jan 2022 20:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643575359; 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=7FCRhYn+bX7WvSoqIDgXvBbiJ3cMkmxXEl/UQEAi6mA=; b=Ug2aXxfTH5QKavreyfQREb1SGcUQIbQegWL7dpEJAI0g0Gi5X+bewleMUvPBGu77FNmPl2 qCVY7z09stZreLNUpsQyDMBkzDZigK9ZPTm+digXYTC9Q6fAY4LDfynVvprF+tF5K5BLLG 4PqI9+npd8uFstoCrOZVMIPG7XftAaKdotU2vyJlG9nj7GhChRwJc+8Y/3tr2Dviwimeyk Z2Jh3yR2l0n6XXndVq+1/8QiofFJAAW+HnIDfCyNrgj3r8Dtk4ULunIQDa4QjwDNqZA5r2 AKHI72jboWbXCikMTyC9ySgm+n8bHechCyYbhtnL+1jjxJ5ibFccoBKmKqme5w== 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 45E0779C3; Sun, 30 Jan 2022 20:42:39 +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 20UKgdeZ028783; Sun, 30 Jan 2022 20:42:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20UKgdGt028782; Sun, 30 Jan 2022 20:42:39 GMT (envelope-from git) Date: Sun, 30 Jan 2022 20:42:39 GMT Message-Id: <202201302042.20UKgdGt028782@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: b02fa10699b2 - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: b02fa10699b28b81d35475d23b9812fb15d7e2cb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643575359; 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=7FCRhYn+bX7WvSoqIDgXvBbiJ3cMkmxXEl/UQEAi6mA=; b=lolx7zyuCFj0fASSbwV8AKUzrSrNvy18WSjdrThMhs2umWTBLJolYSP0ixcs7U8/1R+WtZ RTP//3nAUar7RHBZTSVIauhF69YhieRxxEh9ZPuIhakawzfvZvpxhJcSS7ZbPFokYDY7uD KWJ7E+AJA/1GCG7q+59eHNcSZ3lFdCLI5xdP10k6iP7JxSS/3UcFxalKwe1jMesENDRJk6 y4oZ3BFr6PETnOmBgkLnl23BD0iFn6bCA6wkClBB5ndsvjfPpPmLNO9EqP50GN6HUwgTD0 jKw4I2kM49pIvAmy2TYE5WgmbPmEKQAIrj77gUhRm0jxsIIiOSyTcpz2pPUD0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643575359; a=rsa-sha256; cv=none; b=nck5lZbngo3ykh7rc+wPnclpIqF/ffcoIkYxMtI2u5Ju/h6PTfZLR6ZOStoNtckP0fZnbd 6O5IRti8GCADhceIvb7Np06lUiYMYdZt1zB/cwbXSuiqeS1uGegF+FXfVOI5RvlO2U9BqB 5clSqGtz9+CZ6pWT/0MebEX81Fqr+5uORiv7QD8/8Nw80KVsYrHxufkd5YvjR/X+W3ffAb aiBs0HKWrImpgZvZ4lrcXT9RNZEnpuzL8rNO55DhexEIYcR0EHUKYO9Nv/HQELQQsICoq2 yaZsPDBYip1ibSVUAC5DIFoe0f49Wh7CHyJANfdAxjyzo533bclmYpDBJvRdLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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 AuthorDate: 2021-12-29 16:37:34 +0000 Commit: Kevin Bowling 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; }