From nobody Wed Apr 27 17:35:52 2022 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 69497199FC73; Wed, 27 Apr 2022 17:35:52 +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 4KpQrm2V3Jz4dh7; Wed, 27 Apr 2022 17:35:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651080952; 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=LS3ECpAwatp4lpgH7VYemo/DushOqgh8NyAQJbUUwac=; b=p/h09HQkcEixHDxh0zXecPx0ZfBhgWQ/Ft5nzJyIIvYGGIyCNMucA9l4b+NX9AqF2YkKYX M3f8TI5UAleDsnQMjjdqCWCTcDjocENQQpbE9ldtLRTC+3jzvS/gwY3iIeIteTMOmbigbY m0SalqTIsUq1KI8PfejJCeq3EcohS76R4NI8sKS5eHV9V8vwqyp7OntWcOIogDji3PgC2P ZL2BOXVQJfpa8YdzdjhY+YKwhRgqe0pyI9anvSiTOlrYcSw1JK9jaMF9HRPQkGohjhMTNO 35e9S/5JmmLj8LEBShdBe5Z6H7fb6nB37uDmsDwjMpLfe+ZvZzIY2AwL5tvLCA== 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 358D6441; Wed, 27 Apr 2022 17:35:52 +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 23RHZq2A098099; Wed, 27 Apr 2022 17:35:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RHZqnO098098; Wed, 27 Apr 2022 17:35:52 GMT (envelope-from git) Date: Wed, 27 Apr 2022 17:35:52 GMT Message-Id: <202204271735.23RHZqnO098098@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: c4661f71cb42 - stable/13 - ixgbe: Update mc filter before FCTRL flags 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: c4661f71cb42da91b50e6d0e6158bb6869d887fa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651080952; 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=LS3ECpAwatp4lpgH7VYemo/DushOqgh8NyAQJbUUwac=; b=Qt2kCvNXg1uJq8EC8v1B+Ye+j94PHh5LE7ixg6MvFpKW719Kh7xYdfFgab9Pzte2V12rLT D77u7JDMOvbD7pOZRg2Uj27aasGkCkYb5Wx0iKK3gIE+sJcvBq3on7OCMRbT7Aa7p/RKho p+2604QtNuzY6rR+hSIaRcNuB/P/mtzDBFGlztdZPaoXhAusubkUO1ufNzgPNcYX+5Y3HO O+SM7vFaP2rBtBbVqIPz/SP3piiRvqDyZZvYBQ8tpQOWy3/LBoTLHSQmGgaYlerRMs3Spj 83ehoSQWwQJLEfCP9S+k3+84dlPIg2gB5Oh3hewLgcmjSzUjH2hu5PddYDlvtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651080952; a=rsa-sha256; cv=none; b=CqKqt4IQ7wxzmGbMyO2dit0pHlYHflQ6aSvGUZql2ZJIc9EjEosRFDjh4IqbXpIla1z0Wm BbqnWHjwOcOfr0Jb119vyZIaUB9AS17jVGTFrQlajbFtrArvQMsDprCrVryZlARH6IYs35 Gi5/8cmdnToBG8zcC+w0WEhjFojxsKeGVO73E3V/rhd+e3R9A5jx5yZn3qZfOIDoCo0ZDC lv126weFiumm9A+iFBrpcEYqB4bdH+zM67uAIH6DX9cIUz94xeCmj/48lfsTu9VXFZGuW2 3h3hy7buPOhX2ED2DUTImJPNPJhzJ2gARgI75CdNMuQ84u1JMWLynQEd8AoP/Q== 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=c4661f71cb42da91b50e6d0e6158bb6869d887fa commit c4661f71cb42da91b50e6d0e6158bb6869d887fa Author: Kevin Bowling AuthorDate: 2022-04-13 15:59:21 +0000 Commit: Kevin Bowling CommitDate: 2022-04-27 17:34:50 +0000 ixgbe: Update mc filter before FCTRL flags Update mc filter array before changing FCTRL flags, similar to 5a3eb6207a35 Approved by: grehan (cherry picked from commit 395cc55d896654b8f75071e71e856b22aed87da5) --- sys/dev/ixgbe/if_ix.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 3077fc9ac4f8..68a17993cac5 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -3420,6 +3420,12 @@ ixgbe_if_multi_set(if_ctx_t ctx) mcnt = if_foreach_llmaddr(iflib_get_ifp(ctx), ixgbe_mc_filter_apply, sc); + if (mcnt < MAX_NUM_MULTICAST_ADDRESSES) { + update_ptr = (u8 *)mta; + ixgbe_update_mc_addr_list(&sc->hw, update_ptr, mcnt, + ixgbe_mc_array_itr, true); + } + fctrl = IXGBE_READ_REG(&sc->hw, IXGBE_FCTRL); if (ifp->if_flags & IFF_PROMISC) @@ -3432,13 +3438,6 @@ ixgbe_if_multi_set(if_ctx_t ctx) fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); IXGBE_WRITE_REG(&sc->hw, IXGBE_FCTRL, fctrl); - - if (mcnt < MAX_NUM_MULTICAST_ADDRESSES) { - update_ptr = (u8 *)mta; - ixgbe_update_mc_addr_list(&sc->hw, update_ptr, mcnt, - ixgbe_mc_array_itr, true); - } - } /* ixgbe_if_multi_set */ /************************************************************************