From nobody Mon Jul 6 01:43:06 2026 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 4gtnDp6Rwpz6kBlD for ; Mon, 06 Jul 2026 01:43: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gtnDp3xTnz3Xlq for ; Mon, 06 Jul 2026 01:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783302186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PSFV/E7wKLFkXaaizxudDPml3P8bn/fDSh82S0QPwlc=; b=Ub4OK5b06omYO5cYgLB+20AnaEL90fWbvPAtQzU/3F8+8deeCbaMvH+dxlSLStiTzcX4OG uYEgRmUZ3CvRwRjOV8gyqbG1cFwlwG5G2jtTz49DKlAf1bJLxyLrQvp50cpRXqqs0ULwd0 pLdp5UPcyOukRFug/4jXorFC0yDuqNAMErMZt8aP8nmFpCcKhNKodIEOjNs8PV33nUiNxy 8hn7yUugBLdTDouz0QdHN7gFRnK/O0NufGkwwB1+zBkDbXWPeeN6WXMqVQo2OrCVTsW56y scefFB2U34+bik/ryHsAH4SZhYrFr4gjmuxEITCu0w4kNiU79mEO7lifh1pavg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783302186; a=rsa-sha256; cv=none; b=icwZreLXk8NdPrmCMikWUXIELXWpZskYD9mtpZ4kScYNmv2RHrq9NIr4akFRwjGeo3aapT TsfFd994jVb5l8V7KKiZGYrY8ZdxpiW7InKWip5kz9TMX4YjIpWtKbAz9MphMgiEGFoWOt mRYg3k1xbqoeEFavz0bhScwh8OSCW2UViKraoF6hrt03sPFhmglgLPH6z3wxp6WRm8K2VV EkP4qi/5aptES8cMjZ7lo5QS8nkeJBBV6r2H+ENjRJP6QNKq3iWEny/LOACSmcdqWH8r3/ 5wUCBWP/3CGC7N2cY0qKEm/g0lK5Kl3h3LLbHLyBACBsl3i2UbNuqxXd5WdiSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783302186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PSFV/E7wKLFkXaaizxudDPml3P8bn/fDSh82S0QPwlc=; b=NxJWcDRSRu/XCVlaYw/pPvICS1HIcIZoTTCQlfatWqVMs5h314tpfmfPNcZPeLlpvAMuSF Y0WYdjC0fX8/Nwb/mGrH9Bkm5p9rDnhoGThMpRIbT4HNV6qOBbsbG2PpdQqHYM5yik3rzn wuKEJUsdV9B5tbUBd3xMG0xurjQDlzrelXBBItGYGOIu+Cq5i8VUBQdfOORD8AHwxDeAzA eWlVAyQWPiWVzdpfXJSIvDXDYbqh2aVFFcktzFLZ/8gBMc/o9A5xH2e5HXQZ8wkyQJ+QJe 4e2CsgVSNe+faUzd2sTG7xFRwTfMITclVJs0KywgFOtmqunZaZ0K1BKkI4E3qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gtnDp2xdYzkbp for ; Mon, 06 Jul 2026 01:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f195 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 01:43:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Gallatin From: Konstantin Belousov Subject: git: b86eb36f28db - stable/15 - lacp: Sort port map by interface index 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b86eb36f28dbcf3abcd256dcad8b36ab19843162 Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 01:43:06 +0000 Message-Id: <6a4b082a.3f195.20006628@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b86eb36f28dbcf3abcd256dcad8b36ab19843162 commit b86eb36f28dbcf3abcd256dcad8b36ab19843162 Author: Andrew Gallatin AuthorDate: 2025-12-15 16:52:48 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-06 01:35:53 +0000 lacp: Sort port map by interface index (cherry picked from commit 7ff3b13f12d97b7f67f09ecb9141e6dbaa1ad007) --- sys/net/ieee8023ad_lacp.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index 72c49997f475..02aa1aaa0eee 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -1036,6 +1036,18 @@ lacp_select_active_aggregator(struct lacp_softc *lsc) } } +static int +lacp_pm_compare(const void *p1, const void *p2) +{ + struct lacp_port *const *a = p1; + struct lacp_port *const *b = p2; + int left, right; + + left = (*a)->lp_ifp->if_index; + right = (*b)->lp_ifp->if_index; + return ((left > right) - (left < right)); +} + /* * Updated the inactive portmap array with the new list of ports and * make it live. @@ -1079,12 +1091,24 @@ lacp_update_portmap(struct lacp_softc *lsc) #ifdef NUMA for (i = 0; i < MAXMEMDOM; i++) { - if (p->pm_numa[i].count != 0) + if (p->pm_numa[i].count != 0) { p->pm_num_dom++; + if (p->pm_numa[i].count > 1) { + qsort(&p->pm_numa[i].map[0], + p->pm_numa[i].count, + sizeof(p->pm_numa[i].map[0]), + lacp_pm_compare); + } + } } #endif speed = lacp_aggregator_bandwidth(la); } + + if (p->pm_count > 1) { + qsort(&p->pm_map[0], p->pm_count, + sizeof(p->pm_map[0]), lacp_pm_compare); + } sc->sc_ifp->if_baudrate = speed; EVENTHANDLER_INVOKE(ifnet_event, sc->sc_ifp, IFNET_EVENT_UPDATE_BAUDRATE);