From nobody Mon May 15 05:06:08 2023 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 4QKS4w4Zspz4B8Nc; Mon, 15 May 2023 05:06:08 +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 4QKS4w3fzXz3DDC; Mon, 15 May 2023 05:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684127168; 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=N2zTFJ8CMDD8oOQX1VD5QCLHipgXa3AdXELsWhRSHKA=; b=A1cnVPrBvXsC2p5G9R91tQFWpDKBcRGExQz1kWnnB8vYMgB3NiKMSlb93JRmluD6aHRPuG ZjbAWA2fWG6YjuEqNvIN6IxpDRgjd3J0aR/8X8PLl4yTlTMDlBrtCqr+ALjtRmsvUGjq8T CP/FYHgmwVzHUG2sazS0Pj4UngMvUKWJd/HaVt8hDecztwvTLbI9KBLFBKKyDDISuf989f Dz65pM9Bbvrpewobi0YWv6KUu42ATuOHqtfPqVNuGkFaUTsFLR7mqRk7TvLPEdk9PPh0C6 Lkr+OtEYcDZqWn40+cxu9s0noRzIfi9sv43kPaIfJ1p9umQSpIH9sw0JXLtGZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684127168; 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=N2zTFJ8CMDD8oOQX1VD5QCLHipgXa3AdXELsWhRSHKA=; b=VPMpl7z0LlJcdGuCLQdkSBNWNJLpLKnKcjSitfwCWUQ5y3QGn70ClbgbTWp8ksn/d/Mv6D OkGkhjahCPqtLe93iQavo8yMysJ5WXgpOOAMWXVGpAXlVYVdOeZDRSlbfsZqoGO7f92JG6 dzfnaJ6TKxzzsiqRUhmHmGXAUvrXOADYsMzTJSstw/iBcmnxdt0aRFPXg5d5Q94ZV11K9H DoEXaeaJk3GNYYDNWdq7oeT8QEmxrOifxgDBzNf8tpNR3FiscRTBjuP9pW3ecSwsBVkblE Id20cZ4MoHi3FXy+W/ixxqpe0tvvERxewXk1ZcLd6lrEd5dc69FBDAYTeWgzgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684127168; a=rsa-sha256; cv=none; b=COMU8Fw+XZ5dKbjKEut6MvdzKBKMA2gQyIDZag8GyiecQE6ZwoLhVenw7Vzew64W5uFHwb oYAF27/vekLvO6tudtq2Heuzh6t0pYEZGIpRE3XrcqSOBjI2M/v5wmZJsl+2V8fzT77I23 Mogu2TsEdTiCmYMhuXEDFUTGnEfRTQzfNdRMNy265a/CHDDgKxzWPGPI2136BGO/TaQnLl QlYUVT9pTw/Cof8YmCO4TFazQTY+vsirXxy+08L1RYGNNYfttgwXFURxFOTAJVuoCh0tIc /9UBNqgrCKCbikaBKNPv5K/4wQD50c9fwJ3ZU14qC3kE0/atOedIVqjmOHdt4g== 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 4QKS4w2lF7zSXc; Mon, 15 May 2023 05:06:08 +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 34F568V6021260; Mon, 15 May 2023 05:06:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34F568qB021259; Mon, 15 May 2023 05:06:08 GMT (envelope-from git) Date: Mon, 15 May 2023 05:06:08 GMT Message-Id: <202305150506.34F568qB021259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: eaa16e7edba1 - stable/13 - e1000: fix VLAN 0 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eaa16e7edba1fe8de358f9379a93694537a0ce4c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=eaa16e7edba1fe8de358f9379a93694537a0ce4c commit eaa16e7edba1fe8de358f9379a93694537a0ce4c Author: Kristof Provost AuthorDate: 2023-05-10 16:26:29 +0000 Commit: Kristof Provost CommitDate: 2023-05-15 04:49:09 +0000 e1000: fix VLAN 0 VLAN 0 essentially means "Treat as untagged, but with priority bits", and is used by some ISPs. On igb/em interfaces we did not receive packets with VLAN tag 0 unless vlanhwfilter was disabled. This can be fixed by explicitly listing VLAN 0 in the hardware VLAN filter (VFTA). Do this from em_setup_vlan_hw_support(), where we already (re-)write the VFTA. Reviewed by: kbowling Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D40046 (cherry picked from commit 0229fab2fe0eed843ebec98fd31b7d49bb2e8438) --- sys/dev/e1000/if_em.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 527789622169..09a063191107 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -3683,8 +3683,10 @@ em_setup_vlan_hw_support(if_ctx_t ctx) /* * A soft reset zero's out the VFTA, so * we need to repopulate it now. + * We also insert VLAN 0 in the filter list, so we pass VLAN 0 tagged + * traffic through. This will write the entire table. */ - em_if_vlan_filter_write(sc); + em_if_vlan_register(ctx, 0); /* Enable the Filter Table */ em_if_vlan_filter_enable(sc);