From nobody Wed Apr 13 16:02:06 2022 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 CB71C1AFDF0C; Wed, 13 Apr 2022 16:02: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 4KdnR25NjLz4q5n; Wed, 13 Apr 2022 16:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649865726; 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=ui9ZAtH0CmN1a2oEk8K9PLOHMu+7joVBpG7DZ9PINUQ=; b=Du5ZJsRfAD0pPeao9zxrax/WTju7NSN7eteOyF/BiWQfvOJ5StSicmVbwlY8mzico24l+o dtTHLHkRqJpWY8Lrze5Pq26vLhttR2JxPtBXy58DfUQq7A9JR8USS3urD0phOFTAZwKTRG yR5/ReZSlyVUPR4gXV6rdo2+fs9MzvbHYIE/sNbMn3dp9Sm+nMS2Lkvf+f+nXn9RzEhu4q HMsDNECy4GV3doigO61bxAfCr2wgLoRoMxCGqRs5CIhWOc0oYjCiuwn3m+Wnpuq9NK112u hSBrKlc53EG45PyFTDlq+mdqTFQMNnQLkLcxGZiIdWWzTiq//gQRO0RiglkUuQ== 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 98DC3709E; Wed, 13 Apr 2022 16:02: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 23DG26XK002966; Wed, 13 Apr 2022 16:02:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DG26BT002965; Wed, 13 Apr 2022 16:02:06 GMT (envelope-from git) Date: Wed, 13 Apr 2022 16:02:06 GMT Message-Id: <202204131602.23DG26BT002965@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 07ede751612f - main - e1000: Update mc filter before RCTL flags 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07ede751612f8879675e2970b3875ea3831e2b9c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649865726; 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=ui9ZAtH0CmN1a2oEk8K9PLOHMu+7joVBpG7DZ9PINUQ=; b=dUjtKGUTTrZEnEwrsLXvK3frKD6jjWR5qQfBStKZo6O+vvJm8Rk6Kl0CUi9TVmfiwMMXr+ 0z8jQSlsr75lsgZG3lFAqod38Fpoh1a4lYBADgIdRnvCZPmq+j00mxVPhHdxxtd/QmcQwc fEEOC7dn339DgV93LDgNeWR7l1ZBg7pBJld0tk8iiyKEVQRyk+0MO2AF14nFoA08s9T+qj 7b0nGjpH16axVyUgO85dUu5JWHd2VJOIMvszC44FF2isJ+AHE9W1dNszUaJztyLJMqc6Ww qA2dSHa373LovtHVZ3+uRWhOxLIBentOpRu/OOLM4TAEhGU4h5h27fXZ4qUaCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649865726; a=rsa-sha256; cv=none; b=mQcH84CN27WyPEXnEIfG2pRfJETS22IAi/sYvHmaZXuwvtLuJWyMPybNxE1zlsY89DJNB2 YK+UbZ+hUIz3ft4MgC1kvg6yEH5nMRswmznEmB+IaFH6SWmoWzyZuIUyc/TUwEBGReXH84 ki+PbEd6PMWF28dSweHzdO5KB76KHmDcmJEhUSrKamENCQokOKVbaqAvRTvSUy0TiF09A2 hmzOLf4Dx5TYMyaBK774gQaCqzvh6MUF2u902j2XyEYXWdJFekBuw/RtISs9JHxKHNXcvm yTI750os9dcdycrHaEsCAxkwyDW6hOhOhlwmNDHkBgJoE+Qh0wu08xALUn0FMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=07ede751612f8879675e2970b3875ea3831e2b9c commit 07ede751612f8879675e2970b3875ea3831e2b9c Author: Kevin Bowling AuthorDate: 2022-04-13 16:01:19 +0000 Commit: Kevin Bowling CommitDate: 2022-04-13 16:01:19 +0000 e1000: Update mc filter before RCTL flags Update mc filter array before changing RCTL flags as in 5a3eb6207a35 Approved by: grehan MFC after: 2 weeks --- sys/dev/e1000/if_em.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index cb0c01c9c65d..b3871361d335 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1735,6 +1735,9 @@ em_if_multi_set(if_ctx_t ctx) mcnt = if_foreach_llmaddr(ifp, em_copy_maddr, mta); + if (mcnt < MAX_NUM_MULTICAST_ADDRESSES) + e1000_update_mc_addr_list(&sc->hw, mta, mcnt); + reg_rctl = E1000_READ_REG(&sc->hw, E1000_RCTL); if (if_getflags(ifp) & IFF_PROMISC) @@ -1748,9 +1751,6 @@ em_if_multi_set(if_ctx_t ctx) E1000_WRITE_REG(&sc->hw, E1000_RCTL, reg_rctl); - if (mcnt < MAX_NUM_MULTICAST_ADDRESSES) - e1000_update_mc_addr_list(&sc->hw, mta, mcnt); - if (sc->hw.mac.type == e1000_82542 && sc->hw.revision_id == E1000_REVISION_2) { reg_rctl = E1000_READ_REG(&sc->hw, E1000_RCTL);