From nobody Wed Apr 27 17:35:53 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 BB91F1AA8482; Wed, 27 Apr 2022 17:35:53 +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 4KpQrn4c4Jz4dsS; Wed, 27 Apr 2022 17:35:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651080953; 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=GAAn3ubq6+nRSWlNRnEM94U/lPQrSs4Io7B4pfoiNK8=; b=RZRmz9uw93Rj/szwrjm0elKN7oCPARHY+dJEP5DSsQxmf1cPR3C5UNUgfArLL8wfJnEpDz 9r8+9F+OTZ8dxf+P/mYRfHMDptYoFBYJWVAyEkKIRGmJkNPA0Z5DKflNIchM49TL0RXbtU 0KZJGCJr2onohEcMCYVkJ2Y7T7d0rjoZjng+8rxjOpofx0hzp0rFKLuiu3VSB+8dpreFXv kYLNQClKWm7/hE2qcFJ/6vGtqczKFbUY9kaUh1B/dA9mofyxSUS+W5ZXQW7N4e4jAVlCYD zAF2fRNKGp3rfFPjqzcosGDpcUHGDiVQT2Sm5KLKwauQzJns+yl78Jumf1CkSQ== 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 7B2024C4; Wed, 27 Apr 2022 17:35:53 +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 23RHZrTb098126; Wed, 27 Apr 2022 17:35:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RHZrlM098125; Wed, 27 Apr 2022 17:35:53 GMT (envelope-from git) Date: Wed, 27 Apr 2022 17:35:53 GMT Message-Id: <202204271735.23RHZrlM098125@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: 479ef11e7880 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 479ef11e788058f4f4df45626fe9181052266b77 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651080953; 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=GAAn3ubq6+nRSWlNRnEM94U/lPQrSs4Io7B4pfoiNK8=; b=oxvBEs8lhzhD95axzaFX6OCfrP97o03NmVRnK1CNoV/CtK3FlXgU240RVDslKfH33MNQIA 2oddo86qV9WtyCNsxPaPF7r42fhbfArBw138tcPhY1z7dijSSOF88lwYgO3TiuerV1aH6T FLx+GliDW0JTQkuDLAYoIrekvvhXf44qOhxpbQJt9AdwleYo/fpmn3iVUPYxAYIE3rK54A 7TzGR3UB+3n5Gk9mA6j7xG983jsXxXPlzfrIk8wuB60ojCylUXvhEcMX2wPEMuNPI56Hwq 1154Hl2U/pVxjUZH6mQ2deAJuNE7j+pZMqfC4bGKQ77riQ0Uec2bpHd/F56iug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651080953; a=rsa-sha256; cv=none; b=qKVfAg6GuJlRG99LDywb846LQWlBinp3mEkk2at6b5NwWONXIJC1eNE0wd+FIRSpFSsqwN ori9XKiO0mEESdxe7co1s6taCDCj8D3zuB3WvSKnyDuzOLVYfor57y1UBFLGbgBbw1OcPi rTjP5ID9+/VvFs+pt3KDUj1UzF4VAj8HuF5lRdvWC2r695mhcKnIwsG9FK2NyNkH/oLD9S Cjyv6lO+Wkh3YcFKidTBwFNA1eNNBAqFCifMqS2ZDMR5HFAdVcyL9bpy3rGgHcsMQUlOwp sLCDbpGAmiUIP9RYH0nG4CVbTKbHRVmBS4+7Gfp1o/yt5DraxQUu/ySGw2KZQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=479ef11e788058f4f4df45626fe9181052266b77 commit 479ef11e788058f4f4df45626fe9181052266b77 Author: Kevin Bowling AuthorDate: 2022-04-13 16:01:19 +0000 Commit: Kevin Bowling CommitDate: 2022-04-27 17:35:12 +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 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);