From nobody Mon Feb 2 12:28:29 2026 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 4f4QrZ0QMFz6QR4p for ; Mon, 02 Feb 2026 12:28: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f4QrY6qsGz3vYS for ; Mon, 02 Feb 2026 12:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770035310; 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=PSFlPpf6n5tClcn9TUH4JicrCJngWnHX9pg96tkCiXk=; b=rbYSc0po8yF6QJQtMgEcTzKUe+79hpI/b+Kn9vjWfkUwXrEs/PfwCFqsbAF7gNzSZ24pPd 5cBGkXX4Rbt8ujFoCOZ+W/+U5tG/+O5scMLkL5A8icU/1eXpnjC/FMH7X4dYxUVG2hW0NF HNSo5kn0ct6IzYHiYuDFosDDxIW3bmz6hxU28YoaY6mkPsVIbiCHSY/9sO2+zlWk80FpLh 2NRF+drVg6yJjkux9NvpTE+gy/hz1c7LkkZC/KDjEDujZsZnFPIK4entZfx5o4MAKI9eOq d91oruv4W+dhVQX94nMeAaVwYDY51smOG0bwiVz3yvkrTEo1Y3ZEFBn+VzGqGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770035310; a=rsa-sha256; cv=none; b=rIFC9MpTOEC6JsiU7l89l/Eug/tvVw3BsCR7BuAXnnIDONT5ATdYkM6soJ6slr1+YGAp4P O/LaHiSYBRfPewT3sAbIG4QZJAB+j3Y2xT71cg3Y+2WM3tXWzH7sOK2tcwWfO5J7ZZS1lr c8JsiN3rE8wSIvfNqErHOQb5tmsa8oHZ3MYPKAmZn3JKnKeZXB8BxiQLXbjmB6LHkTtRDH lHOCFX7HBQL8Dvr29d1NAorESs9ry/P+0J2NhmV8eTrO882rfd6KI++TtuNURixvg7ujy8 oT9Wy+NolW8NPBKbXiIh8WNrpqCHsyblhOMDRdOUZSnWiquarZ4hitalLPmuyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770035310; 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=PSFlPpf6n5tClcn9TUH4JicrCJngWnHX9pg96tkCiXk=; b=CfvHoSs2dLZzZbDMAtpBuQA+pFBcRvnmon7//ep5atRegWkekTBZL5NppVfxDIbW4GhsTI NjAVefuxxK1SrnRyDeOH/b69LA0kLAWNnTsS1ugoAqxQxz6bvP76gs+8xXuO4aYDK1l0kj 8tbns5jl9QdY4lF/I1GJ4QuNn2czaUs0U3koH++hVrTcqWNqrnEBZjnN2u6pCTaVt+ekgd ixCnmz77eRORYYzEckPY7MjBXSVbCCvy8h60tdSAAMyg4R4/7D9Zi0nklnMBsL2mewNe0y lIDWQh5QQOSSkuyNsQTG5VFpOGm+PzRWPIhEQ7bzdVVTqpjh/gKiQmQjmLOVfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4QrY6Mf1z9bX for ; Mon, 02 Feb 2026 12:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20f39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Feb 2026 12:28:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: e63ee5fedb8d - main - e1000: Fix setting the promiscuous mode 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e63ee5fedb8dab51f1bd6d24cc650b68d9663db5 Auto-Submitted: auto-generated Date: Mon, 02 Feb 2026 12:28:29 +0000 Message-Id: <6980986d.20f39.48711372@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e63ee5fedb8dab51f1bd6d24cc650b68d9663db5 commit e63ee5fedb8dab51f1bd6d24cc650b68d9663db5 Author: Zhenlei Huang AuthorDate: 2026-02-02 12:26:31 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-02 12:26:31 +0000 e1000: Fix setting the promiscuous mode The variable reg_rctl stores the value read from reg E1000_RCTL. It may contain bits E1000_RCTL_VFE and E1000_RCTL_CFIEN which control VLAN hardware filter feature. The promiscuous mode implies all tagged or untagged packets should be accepted, so the VLAN hardware filter feature should be disabled when enabling the promiscuous mode. Calling em_if_vlan_filter_disable() did the task, but later writing the value of reg_rctl back to the reg E1000_RCTL may restore the feature. Move the calling of em_if_vlan_filter_disable() after writing the reg to fix that. PR: 292759 Reviewed by: kbowling Tested by: vova@zote.me Fixes: 2796f7cab107 e1000: Fix up HW vlan ops MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54973 --- sys/dev/e1000/if_em.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 7d7655a7ae6f..4d7bc794a0b2 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -2106,11 +2106,11 @@ em_if_set_promisc(if_ctx_t ctx, int flags) if (flags & IFF_PROMISC) { reg_rctl |= (E1000_RCTL_UPE | E1000_RCTL_MPE); - em_if_vlan_filter_disable(sc); /* Turn this on if you want to see bad packets */ if (em_debug_sbp) reg_rctl |= E1000_RCTL_SBP; E1000_WRITE_REG(&sc->hw, E1000_RCTL, reg_rctl); + em_if_vlan_filter_disable(sc); } else { if (flags & IFF_ALLMULTI) { reg_rctl |= E1000_RCTL_MPE;