From nobody Thu May 11 07:49:06 2023 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 4QH3tp3j7nz49tDF; Thu, 11 May 2023 07:49:06 +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 4QH3tp3DWqz3M25; Thu, 11 May 2023 07:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683791346; 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=gwQD0sE7vKRZoHBFLXIyfm6qdwu4xl6te7zWLoVV1eU=; b=qa5xfB302WiTATrOgGM5BUbDQJwZthpzwSPLqQzzrQ+zMTW6NTjVsA1A29zktr9pzBe1Ht j71tN8WqrnMZB1Btha1QOOWroo3qtOoPqAszD4EnEJx/JFHD3OmcLsZoKSLeZG+KKYyuXr E1FKNOAGu2U+fSRCr5Jdd8afHClv4t/8mpziHQzkpZM9HJfoFH6xnnmN55JX2zPsyi+smf u2cI+QAC5CesG3Pjl2nJHCl8A+CXIYGKDZ5lFyXGkLXQoEC/QI7Ab2n53v397W0D4EvSTc aPJCqFchPi+dN2JCwMKuyAoz+5Qp6c5ijvwDBLnuNTigPoX23qkvABo6rRcCmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683791346; 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=gwQD0sE7vKRZoHBFLXIyfm6qdwu4xl6te7zWLoVV1eU=; b=OE5edalTFi3G8cwtgaUh84Le+Vp/VlW05x8eXCKnoFOPUcwlRoRPN6FEeUVUGchZ4Cc/+N 0HqIIaHfZbP0zCKxleJnwxs4ayhNmyDTXFHBj3Eo2UwVYWKZCoRWTRSn9q9X/p6+JGufMY j5HY3/LWmImYVNlDxmv1IzLUtbV3rnkVmyD+JHBOzHdVVaHbYsGPFxzkuNoZWpXJDmjncq VKKhHc9Z2SsvhOBvYD5Ap5ktXdF0MXrzmSSCeyW6QgQmVCSKY3cznaK+kW3a7tjRVtGO+/ Q7Eigf9o3rHbC/yVpLrRMVsT+t/DaYJJfwy33VWa2w9w86feB7HayxIPlbfVBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683791346; a=rsa-sha256; cv=none; b=kczM1yButki2R9XpVh/t0zDU8cW3ZMh/HOP8YTkcH7rdpxP0plxlT180m1zUvwdJYbdPf+ M0AYrYLEy2d+kf9IsNoG1UNMy9fOUtOqWnLgrPfI3wox8M6vHuDznRHxeKb3kS1/yvWGSm cmLMuekA/F/jaBCmZfQqUPKJlBvqUj4lLigHk4wMIgAVwyT59EEtODRnJIpJ37TOOcwbVM I55xZStvgy60UpWH4zi4lQRrAbsjF8pOS0HY4/MJjTG9HkFOMlKFD/l5TgNdTivU3DvCop KEOq3Hz0a4zMs18MzqqLuHLQmE5w050USHjpiLUpORPc4I84sL9Snl3AmQIHOg== 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 4QH3tp2GsWzkV9; Thu, 11 May 2023 07:49:06 +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 34B7n6pI099985; Thu, 11 May 2023 07:49:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34B7n6og099984; Thu, 11 May 2023 07:49:06 GMT (envelope-from git) Date: Thu, 11 May 2023 07:49:06 GMT Message-Id: <202305110749.34B7n6og099984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 0229fab2fe0e - main - e1000: fix VLAN 0 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0229fab2fe0eed843ebec98fd31b7d49bb2e8438 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0229fab2fe0eed843ebec98fd31b7d49bb2e8438 commit 0229fab2fe0eed843ebec98fd31b7d49bb2e8438 Author: Kristof Provost AuthorDate: 2023-05-10 16:26:29 +0000 Commit: Kristof Provost CommitDate: 2023-05-11 07:48:50 +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 --- 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 89186767bc60..0b664b155872 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -3681,8 +3681,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);