From nobody Thu Feb 5 05:13:45 2026 X-Original-To: dev-commits-src-all@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 4f653Z152dz6RF7j for ; Thu, 05 Feb 2026 05:13:46 +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 4f653Z09dtz48vp for ; Thu, 05 Feb 2026 05:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770268426; 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=fIxAkreTMemihXWgyOnV5sO4y6TA0w7DXgSOY8mjKSk=; b=Uw0n9t24nNCaSCr5/ccayiKGfgt64gqOsQg2kGbOFHrPYT9ZjYrhJqrKhQEZ1h1VL8X5IT IDVQw+7Cw99bOp860CwHesJ88lRFeD38xyHcq5lBmuJCjedYVNhPGg8hLB8y4B7Hd/IRPm /u3us/io1aGO3lK5gxbFkDKpSt0tnjApkZMjVNGNy1HzCabxsf7eJ7voDcsMLlvZ8MhDGg gMRdZfNUpefVqBTc0YEWW3jSmdY4Fyk+/qZszJK06K4Qa9LYS+EzP378NRGjSWFjGnK8SU PYW5x5hLTqJSAW7rqrtTXq9A+cs/Vm5My4cMnRTtzOZ3egCfbu6p95cDVATWlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770268426; a=rsa-sha256; cv=none; b=fzWbSwHfRohsFIZNkKULFUIzzQ4FTkm/3lNdKTnOOfoqhyWETzxpO+YInDbrFDkJ01fUbW PFiCp09/1VGCXYNLZEDoGujwQniDPQauiM9ZH01SmG4cwq82G+rYIolBfKqVvaGCGi7cTa 9WscRisz0Z2W7vzpEUzqM3QtXlM7IXhZcnqSuD0Con5rCCLWfOaDbkpx6NRw4/78+lg7Zs 4bpwJKWH3y+PuJHNWDY1nQ5uZGj/Sw52xPSXq5t0+gf5Eiy2lRuia42GEkKsOIrYnm3uNJ AML2l9eSg84Gzah6YIBkb3AFpM5f94jW9baHuxsEr1CF6U0QrlGOtT16jEJqZg== 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=1770268426; 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=fIxAkreTMemihXWgyOnV5sO4y6TA0w7DXgSOY8mjKSk=; b=kb38UQHROvREt+RdPkv3OSbyKcoqW8L+n+RBJqa3tTzkY6P8mw5JuuJ7T33i82ZmyE+JMP ubUa40yGMJOfnDWShbToIeNnxohTE2ZpAuwB2jhpHE7XHAHhaLsGXoGR8mtPvHFiG1NIj3 oKQkGJ5atPwxw2nZofJW3j9VurwIRYm12i3hrKwmotapdX+Ajbr1MI7M/lJQtTNQ+kcj8T tPH1snZeUgFbJ+9likHpZaiH6/SBztVNuQINGSFfks/WMX0GZ1lXywct+fLVcj+nP/R2Am hdT9dFG2RI1kroQLTcXXt6fF/E7MUrQIAByyqeFpW9+JGkOtYOOsTpY3EiVGbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f653Y6Zl1z1Rj for ; Thu, 05 Feb 2026 05:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ecb7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 05:13:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 8880678b7a47 - stable/15 - e1000: Fix setting the promiscuous mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/15 X-Git-Reftype: branch X-Git-Commit: 8880678b7a47ccfdcc14d3e7cad7f137862dccea Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 05:13:45 +0000 Message-Id: <69842709.1ecb7.3b9aebfd@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8880678b7a47ccfdcc14d3e7cad7f137862dccea commit 8880678b7a47ccfdcc14d3e7cad7f137862dccea Author: Zhenlei Huang AuthorDate: 2026-02-02 12:26:31 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-05 05:12:36 +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) --- 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 444b16912fee..49adc8caa325 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;