From nobody Thu Feb 5 05:31:01 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 4f65RV0Qplz6RFss for ; Thu, 05 Feb 2026 05:31:02 +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 4f65RT6XYJz3D7y for ; Thu, 05 Feb 2026 05:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770269461; 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=nzFYOUwyNEJmQIDr6QnQ/EqFzx/N8JuINKpty9bWBUE=; b=YbkS21eRDmMGSUV6oakAb7TB2kqpOWAb+dEq1zCnsX0P9lKRzawcBelKuvxFZEdomlw76i uuHyLbsBOrKXawgcvRLef3d5W+ui4GwGY6t/WcT1CDPoV6xmAMzOudNHTHeePo9S5bxuKY JAG/ChsRNAQwmi7mXPEcZjKZlDWP2f8Ik0+qr/wziHw8UI1pW508q0Z+28oW6KE0A4VjDA g5B+sUnZ3CZPhyUo50cpPyBwtgm184TmCzTay/4RB+cth4rBrDXxdU/vjxrDtqsmA4QKCM l4pNgBEJAxq8JqST3GzZXdH2i2ohQGa6Fnd6j0mkd2PHWv50b7UsUc19oWXm2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770269461; a=rsa-sha256; cv=none; b=Sdbhf9oFLWsEFsG/3ThAf3F71BSl5vwUOpYemQyMyZQN/JhpTSZQa5cFcFTY575SLgfY3d ajRj3nfzGAq+cNLiYtw675qErRc5RbkhD/cixtyeQoHwUfBai8qJcsCWWNHNWqWwxca0To CW6zx7/bjFed1teuBQIFFVWj8V7G+Q5VfEAkAjmxQF71uZDMo1yYtcIC3axlwcq8GiiD8f X6Q+83XR2ihmqc505Or+WtM+Jv7MKxGFU+eflIKL8FsC4mhPthdYNKUCQkElR9ii0RWTzv R7PBWhnZeFm5vkhNvMynAVp553etm17abQcsQcZNS7jTnA5KKs2pW4Q0rcJecg== 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=1770269461; 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=nzFYOUwyNEJmQIDr6QnQ/EqFzx/N8JuINKpty9bWBUE=; b=g9BKTjcC3lxsHjHwwkg4GYNerZRd+KTzhPTiDAV+SIpcTIkjdTJonTMfUYQo8Kmu+qtPTk 8PZx4gGTFyyh+kDLbzMC7jneK/AgDePbCl9NmoIgaaaMO5Rer71OR5t3oSS2+TcKAFs0Nk hA6TA5OTbe7GZ3/3nYoD3cu7Z7KRfEjLCxzmJC+hglWn9laGqXmPIjeh7sbVT9QitzinwM 6ZphRwzUx0GjiJjl0DrdJXR0KImXCR0aufLx7jmQL8bT/ra7xR+B/Yr5a56rsR5P1USsJ9 7rzmf5Ne8h4Zi2Nn1WrC8P+7eDxEnPmee1lQaNWul6YFfRJ7dEAWGItho+sBeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f65RT5rCRz1TX for ; Thu, 05 Feb 2026 05:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 229a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 05:31:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: b562bbc06adf - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: b562bbc06adf2039e00676440c83dcd7f6900fa8 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 05:31:01 +0000 Message-Id: <69842b15.229a0.c7d95b8@gitrepo.freebsd.org> The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b562bbc06adf2039e00676440c83dcd7f6900fa8 commit b562bbc06adf2039e00676440c83dcd7f6900fa8 Author: Zhenlei Huang AuthorDate: 2026-02-02 12:26:31 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-05 05:28:50 +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) (cherry picked from commit 3cfe90545f016fa190158aa4830f3256e01a7cb2) --- 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 75b8940587f6..3244dc9fa348 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -2094,11 +2094,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;