From nobody Wed Apr 27 17:40:50 2022 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 64AE91AAA09D; Wed, 27 Apr 2022 17:40:51 +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 4KpQyW1dTWz4gGL; Wed, 27 Apr 2022 17:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651081251; 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=w2Xx0wxUuVHqc51aSCqGTjUyZ2UQ2j/jHL3aI5lwdYg=; b=g/kazYG5Sm3HdzuwJ7yxT+p16/X4aH2lBIV3NdGmvg4l9eMncPhyQYwuTKKhh4I8Wm9i6/ U1gDmUmsYfUiBQDsVEm152X4NflFFO90KS5oc29BZPllI6NBhyRa3gtkou7+FCJZORWCBq ubDaO9qusIIMJb1K3SKYwR6uk60a048w6vW2eycsKsm737dG1Xx+Vq413M0ZrqBtK4ey5J nKOSDOzwX8KIeBAVTwTQ0k0jvpVHnmtaMJHoe0Dz8dkZRof353WIFNyZdE87vm9PNZhk5h veJqLjgHBHVZ0EUsVwkcRR7hPXxYt3TPae+yh8wOM59yPHw7ZuXF3E/1E8yOOw== 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 10D811DD; Wed, 27 Apr 2022 17:40:51 +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 23RHeo7T007221; Wed, 27 Apr 2022 17:40:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RHeo07007220; Wed, 27 Apr 2022 17:40:50 GMT (envelope-from git) Date: Wed, 27 Apr 2022 17:40:50 GMT Message-Id: <202204271740.23RHeo07007220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: adf0ac345020 - stable/12 - e1000: Update mc filter before RCTL flags 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/12 X-Git-Reftype: branch X-Git-Commit: adf0ac345020fc975db407171a407bac2f489c53 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651081251; 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=w2Xx0wxUuVHqc51aSCqGTjUyZ2UQ2j/jHL3aI5lwdYg=; b=bzdgzDzbPtlXEKojvIQgWNEOG9pX3hTbvrBhk6eg9/h0h5AREVnqmap1dWqbjKK/+0phEG lLwsfwwKKGAN7eSFVazkSR1bL2PdDneNywSTv1LnWubixIQp5wO8U6w6tQxz53At2Tx7BY Kvr/w6hBCRZRO9oLDHDrh+YOk5cY1NfGN6GwewwW7+DHJORhzR1sto9epefJrrQ+KwtNn+ hqEBzc9WoOui8Y3fcjKTCfF1wukiEtCZQnrd7eWzunGsMeFTSVD/RfVoVFOGFyJYc/1E4y ag0o5v1DgmSweW8mrHzKRAvrle/CHuDOO2dxynl4HjWsqSbFi3eksGfF3wQ9tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651081251; a=rsa-sha256; cv=none; b=PDjH5whHeqepCIV4Nes4lc60PtIQf0lD/dCfZU4CZDXN6pMtLuhGAe5duWxrW9J/OIbR8X GaRzEYF8KNMn9WVlhF4BhgAFghMWspZB22BLWIB9913zQyqeAywKhaQmZgul+Zw4iOuGbW GReJDMzGOc2Ycf6zCJuZ4kYh1gF6jo7di5z38XVlDFVqsQR1m838Pwg6HfElDIVRhVn5dU uoaSVGBM8uExjN0OyDuzJDVIjNg3QvZveXymOHDXOE4g1nMwJUileZYxNYPhHIAKS4TXd1 rpIjH1GpU369WDtVab1WnC+4NUaYZ+mcF4PmcCkErBMhDYdaFIaEnGezXgPSdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=adf0ac345020fc975db407171a407bac2f489c53 commit adf0ac345020fc975db407171a407bac2f489c53 Author: Kevin Bowling AuthorDate: 2022-04-13 16:01:19 +0000 Commit: Kevin Bowling CommitDate: 2022-04-27 17:36:40 +0000 e1000: Update mc filter before RCTL flags Update mc filter array before changing RCTL flags as in 5a3eb6207a35 Approved by: grehan (cherry picked from commit 07ede751612f8879675e2970b3875ea3831e2b9c) --- 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 696c6007cd9f..d7b4ab61303a 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1723,6 +1723,9 @@ em_if_multi_set(if_ctx_t ctx) if_multiaddr_array(ifp, mta, &mcnt, MAX_NUM_MULTICAST_ADDRESSES); + 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) @@ -1736,9 +1739,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);