From nobody Wed Apr 27 17:40:49 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 2113B1AAA109; Wed, 27 Apr 2022 17:40:50 +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 4KpQyV0N9Vz4gDK; Wed, 27 Apr 2022 17:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651081250; 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=XJ2xXg4nWxeCnno28wX5f5EBCx+pQ/iJObRGl36KMK4=; b=NbS4o1bJ2hROSxRvF1WIDlXgLFOviUr7A+PA5aOZ2pLQTeDyVoNemSvmi942zceoRqb+IS JAAJYt6PscUdTRQnBLKd706aCffTfdbJqnUpcLtUcUwfQHHYBwKBx4r5XMbvwS+bqne7Xm WB8sndF5N9umbjCw3sgT51VUkQ3BJD5gwPVtaUV4nVg0xUtBtXb+eLot7aTkY+VHZoqIup Fg7y3RxuQ98OL3zRvj3iZOWO6AFbssuZvPlXGl78aVfcRrhroSuz2VGhfv9/cWU7A1OJc4 cwMgnkaq/tyvwzP3K9gac3yFq2RLuSM83yBo2LArFh1uKnzy2PuIA8gTeoCXvw== 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 E1E174D5; Wed, 27 Apr 2022 17:40:49 +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 23RHenr1007182; Wed, 27 Apr 2022 17:40:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RHenwJ007181; Wed, 27 Apr 2022 17:40:49 GMT (envelope-from git) Date: Wed, 27 Apr 2022 17:40:49 GMT Message-Id: <202204271740.23RHenwJ007181@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: fc3ef237e246 - stable/12 - ixgbe: Update mc filter before FCTRL 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: fc3ef237e24690aa9b5fb0e93bd07f489ce734df Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651081250; 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=XJ2xXg4nWxeCnno28wX5f5EBCx+pQ/iJObRGl36KMK4=; b=kUOozU3wp1JgxJwvnfAikb3C9+XdOLRBCiRIQDwsSQETiONfAxfo5cstJRupwxh6UCmbit bvI2CwOKFEXcksG9efUvBSQWR+AdcN2OIG0MSk/eJ+ucHI/FQ7nMdLWVdfvm/NLzsltza9 WeYSxMGbQh9vJgRZBHkUHxi5tCJa3nzotqOi1OkQA+1tAmgwQ5LEHugsj7y692LONz5Ttu OR/sVismN/Dlk68c3dQNv/gjSW38bmRkuoLJQMlSkI0aGzZVOAmch5ds7jYlPYWO+9is0r SwXpVh6uv7vC6jEGxTo/1PknaXG2xlKqMdSu0k9Dvke8oh+WEpzrE4I8VjANsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651081250; a=rsa-sha256; cv=none; b=Vfc5TKlugmlhy6J76PQBpbrqHKmvWhWvNODnGZ2dP0+hYQlPZ1kwMR0O5lS8xknc3pnSFz ANqkjSzSbWsqcdB9s5EDsOtSNFkS83nuX5eSQ99f+DUA7J6VR0crxgygYA/c/kb5qKl5Rq +hievMDEkn0TyX4+bpMkhs4j8RZ8kvp2BiCbEsB9p4bETpis06viazgPR0AlO6xu/oJvwB iXiTg+pE+wqyM3n0SJkrVBXBsReMF+wPvEuAMwrNxhvOJVCfgX3v2c8htdXK08iA8DUTgA wYnD/PHF6nQNVnz+M63l4CAn9oYvdrWy2NU5duqb+rkT+97wzsWogVZgJnah/g== 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=fc3ef237e24690aa9b5fb0e93bd07f489ce734df commit fc3ef237e24690aa9b5fb0e93bd07f489ce734df Author: Kevin Bowling AuthorDate: 2022-04-13 15:59:21 +0000 Commit: Kevin Bowling CommitDate: 2022-04-27 17:36:27 +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 581944fa6a73..9bb368ae8a90 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -3289,6 +3289,12 @@ ixgbe_if_multi_set(if_ctx_t ctx) mcnt = if_multi_apply(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) @@ -3301,13 +3307,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 */ /************************************************************************