From nobody Mon Jul 6 01:43:07 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 4gtnDr0PKwz6kBPg for ; Mon, 06 Jul 2026 01:43:08 +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 4gtnDq4ZyVz3Y7k for ; Mon, 06 Jul 2026 01:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783302187; 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=3DjrOYnXamHUCPAt3G8cox8GaZsFH1EW1RSC2HGDopo=; b=qloJHEy9Y5pjg2A9rbSSeWeWs2Z+TUQIxIEaQrA3Sk0GTOlbxVB01AxSRE/H+RtO8ZBddd LchTWAdDpKOONT2zJUYyf4ex0xBFKPUH7oukD2tf8SQqMIfCvBidDSrROLRxrFd3hFvP6g kJEmiU89H/Bc6/0UsPuA4TgpjCoIbGHTe1mHTatcN8e7Jmc3SwCwgvhqa5yqK8nelG4YmN MXnzr7BKFxcqveeo6vu+2HWkWrj3ejXOFyLUXEaNKm+GsW7AKeVIrTtQqRr0tjAGvqt4QC vmX3kWE6BEzYhqvgSQUa07VJHZg4HVD4klPK9wMotfMWw+ZC8uf4nSLYyFXLNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783302187; a=rsa-sha256; cv=none; b=qA4ouM9sT5/lWIKrKSK7/Pl4EsiPRx2sPTw75D90MQOIBYBTqghOompJKnLYLPSZ84kuvm he+JX7rRQ9/n3afk7TTUDQfppN40H75f6e4ittUHIs9DgOXsJRprBpUGHeLJ9P5UL24Aec l5kopvMkcaA8iA5/GjSvwa+323a+vWerXLpENxGZOfMQRgSvBgrjjuyi1rHLiyb1jS7HaX od+XsuOBqI7xCAFKFJHVMjX6O3ywVRqNI5URYWi/+NW7pmodKtfkpiI5no7m+Ib3POBZQ+ a1J7VYVrM0epFPQhBBMLdE32DOADzwghXGLeDnGcWYibYIcgrz7AyDbarRsUTw== 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=1783302187; 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=3DjrOYnXamHUCPAt3G8cox8GaZsFH1EW1RSC2HGDopo=; b=OdiejSxTTD00LH0yNeqgbMfLFBS6AEAPELTYtUJzd/fFbmBhqb+WqXzBbDbkWWzBazpyx/ eaS3R0I5moRiXQs1cDVaGDIf6F/2Lq8VYuWQGjbkAFFyh37GX3rqN/xQQgn53+P825uWyD GvVk+i6YYjjGSk8Nt317SUElaJj4nx5Ay/W+VNUnk3ezixRORLlUybJ6XXvx7qSAJV723t 01jtzYKm6nYkH9xjv4egwp6F+a72lRv48qR38u7NDf6brtUWY9T9zcM0eVDlyAQGq5mch6 klkGcuN12qE+miNwwroijbDZXH4RTZWVYPUmoZE5HEAgIiDPqV1pTawuwF8p0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gtnDq3Z1qzkrR for ; Mon, 06 Jul 2026 01:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3da59 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 01:43:07 +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: 020f7f6cf1ff - stable/15 - lacp: fix link state with multiple aggregators 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: 020f7f6cf1ff2ace74c84dbb1caaf8cd5e71209d Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 01:43:07 +0000 Message-Id: <6a4b082b.3da59.4a08b651@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=020f7f6cf1ff2ace74c84dbb1caaf8cd5e71209d commit 020f7f6cf1ff2ace74c84dbb1caaf8cd5e71209d Author: Andrew Gallatin AuthorDate: 2026-05-12 12:52:24 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-06 01:35:54 +0000 lacp: fix link state with multiple aggregators (cherry picked from commit 9f69446d45484c16d2b9b9bf71bbb2fca86cb6e5) --- sys/net/ieee8023ad_lacp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index 02aa1aaa0eee..9726b4c4dff8 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -682,6 +682,7 @@ static void lacp_disable_distributing(struct lacp_port *lp) { struct lacp_aggregator *la = lp->lp_aggregator; + struct lacp_aggregator *la_active; struct lacp_softc *lsc = lp->lp_lsc; struct lagg_softc *sc = lsc->lsc_softc; char buf[LACP_LAGIDSTR_MAX+1]; @@ -703,7 +704,6 @@ lacp_disable_distributing(struct lacp_port *lp) TAILQ_REMOVE(&la->la_ports, lp, lp_dist_q); la->la_nports--; - sc->sc_active = la->la_nports; if (lsc->lsc_active_aggregator == la) { lacp_suppress_distributing(lsc, la); @@ -713,6 +713,8 @@ lacp_disable_distributing(struct lacp_port *lp) } lp->lp_state &= ~LACP_STATE_DISTRIBUTING; + la_active = lsc->lsc_active_aggregator; + sc->sc_active = la_active != NULL ? la_active->la_nports : 0; if_link_state_change(sc->sc_ifp, sc->sc_active ? LINK_STATE_UP : LINK_STATE_DOWN); } @@ -721,6 +723,7 @@ static void lacp_enable_distributing(struct lacp_port *lp) { struct lacp_aggregator *la = lp->lp_aggregator; + struct lacp_aggregator *la_active; struct lacp_softc *lsc = lp->lp_lsc; struct lagg_softc *sc = lsc->lsc_softc; char buf[LACP_LAGIDSTR_MAX+1]; @@ -739,7 +742,6 @@ lacp_enable_distributing(struct lacp_port *lp) KASSERT(la->la_refcnt > la->la_nports, ("aggregator refcnt invalid")); TAILQ_INSERT_HEAD(&la->la_ports, lp, lp_dist_q); la->la_nports++; - sc->sc_active = la->la_nports; lp->lp_state |= LACP_STATE_DISTRIBUTING; @@ -750,6 +752,8 @@ lacp_enable_distributing(struct lacp_port *lp) /* try to become the active aggregator */ lacp_select_active_aggregator(lsc); + la_active = lsc->lsc_active_aggregator; + sc->sc_active = la_active != NULL ? la_active->la_nports : 0; if_link_state_change(sc->sc_ifp, sc->sc_active ? LINK_STATE_UP : LINK_STATE_DOWN); }