From nobody Thu Feb 5 05:15:52 2026 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 4f65603qT6z6RDx0 for ; Thu, 05 Feb 2026 05:15:52 +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 4f656031GVz4B1F for ; Thu, 05 Feb 2026 05:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770268552; 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=RxChxwBfC123ebWxFJb4mB+GBA8+iFKdghVe+0JRuyw=; b=Iylf/ws2JPnq6zHABWCqM/YrPOYQdXF5hY5EF0vr7WuNp+zjCycaQzkRGmV5eMtYL7nzjQ 1uIvAnjlCFX/3Lcty4rhkUl/VGC7602n1uBo4K8ohKdwMLcboGF8nM2uC5uR8tT8Fk8rlM ns9fKIRIvYKSKa++J/fEq+St5tMTDCRTD8U4TtCpwEjKloLsniz6Uw+TiVLMws9dO+NyiS +ELA0jJEx550lBNcXSzLWm19gvtiuobD/G3ebinTeOSnjDuvE1hLBizF5c1RqBJGh0tiTa sWgBRXLK4y2RSPRNkgQwYmwjRrFMY/i5pHPXthuaJlGL59LMhITWk3jeY3d7ZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770268552; a=rsa-sha256; cv=none; b=PFjXtxPU74Sg49CihXNyOxAvfvcFuGdmdkM54/YNPvdzyT24cfzqFpiykRwqQpjmheCm3w uxqqQ3fgwI1kgUWGSQfz7cRbWEfZVaymucmkVZ4d4dBfgLehW3F2IuOBBECLBMmuz0Wlkw rnVwMkHwjbyMMi5XD+gGhf8LgytebKXI6XHbI5lEqKUtn7w4VA0sbbHd5jnpnduwZqWhOH DUy0SSiFscC/NQV1ldIRDEYtDrr7ISw8mvaC5Ln9Zpa7e9b8CVNaHDNiAkA3QCfzz52YzF 7ww6ldcDgtEE3Nx3iKt7GLveMn7ZEzS6sVFE4zAuba9EdGXVaQ5VV9sAt9jNhQ== 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=1770268552; 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=RxChxwBfC123ebWxFJb4mB+GBA8+iFKdghVe+0JRuyw=; b=CmrZFHWNM5NcwZC+rg/YUAMeiZU9VFf3ynlAEGAe/eR5dcYfs3fjqrjGfkd8vVktqWUHyn JmH6/XK1dh8CDaZntbFodWpYvLp0LKJoa/wYEWRMw8zj+y0ptQk4EUlHc0wL3Wj68nP5HE lwXgduULguVmlR6EqzO6DocT+FFujUqZQpvtpwvl4Hi7euivReztk6wlUWjOOm5jUQKXbB ufg+UcemFzVmTpk/ffGcSJzpTLKimK6n75xqhEmC2+belOhYUShw1VCZhCPyZWTdBoLp1x 5loA7nfKuasjakgh8u76s4Yyb+9F/PmcA3laFe1w44POi6bFxgh8jDF/PkWxOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f65602FKyz14x for ; Thu, 05 Feb 2026 05:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fae2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 05:15:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 3cfe90545f01 - stable/14 - e1000: Fix setting the promiscuous mode 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 3cfe90545f016fa190158aa4830f3256e01a7cb2 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 05:15:52 +0000 Message-Id: <69842788.1fae2.25d3fbde@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3cfe90545f016fa190158aa4830f3256e01a7cb2 commit 3cfe90545f016fa190158aa4830f3256e01a7cb2 Author: Zhenlei Huang AuthorDate: 2026-02-02 12:26:31 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-05 05:14:43 +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 (cherry picked from commit e63ee5fedb8dab51f1bd6d24cc650b68d9663db5) (cherry picked from commit 8880678b7a47ccfdcc14d3e7cad7f137862dccea) --- 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 553a334efd6d..318620c944a3 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -2099,11 +2099,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;