From nobody Wed Feb 11 10:03:14 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 4f9vBp3xp3z6SMZg for ; Wed, 11 Feb 2026 10:03:14 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9vBp1lllz49PX for ; Wed, 11 Feb 2026 10:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770804194; 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=huoBY4XVgjTTyYHfidbNqQdx0E/BLinE9ZyCMJ/Ggy4=; b=LSaZwQuT7W/XuB4/Y/m3hc6yGcPUNQxoU/YkadoRpU5XDZAXRzZcspADutx9002A/pHVrm HNLdtvXiPZ1kICUAVIGG6kZ/3Fhhd4UHQCCPV+JdtA11IEpyv1AtdYZJH5PhLfTt56rdoR 60HcOq9yV/2xPhX2XSszreGn8i59wsgmb+yWjWpz3xREVNrmfEUdtXL1H52MBgqWAdvFHa MjGDOUlIwAoTpDi89POK34/7BWBLqr8vPVgzsAU6XoeFpACbe8k510lLxFs4BkDKsPKUs1 obToQ3sJHAP5xYelARZtqQYGUUSIff1ytUFoyCOXo1jhOfG5fXK56B94opIKOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770804194; a=rsa-sha256; cv=none; b=wLKmuJpptkqJR/XUt8YtX5wG7ixc3HkNtTSYX6N9rT7e9eDcB2mGRz8EoY5kXYbwXGxb8r vh94rh2NzY/qIiUAycpY8pGLnfDpy6TBnEcsa4tKsk3F26E71qkyb6FLDlLl3TByAyTHdc gaomXbrjBOZgEE1r7kzkomMcZ3bUdu2XBERn5Gn2L81LZqkni3EU7Ly63EyzZZ7bVKg5q/ WUi/hTeyNcn927EG149lhe2lPnajR1ATzz6jmrXBQA9fDNVd1R+o3IahmpwQFhgN4WiDu1 6pd8YGOrghhOlNtg7DfxU71BKNS55JdpkOsMi/GG7ZGxIZUa9vUKQtPI/rueGw== 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=1770804194; 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=huoBY4XVgjTTyYHfidbNqQdx0E/BLinE9ZyCMJ/Ggy4=; b=sR7+Csukavr7R0mSv5DUY1v9NiFVfxYmrTi+x3F7TFEmUrKVo7WGccvM97tcuXVB7LMqIY 7KNWnRKk9qmKRTIxaSPigwAuc3zOfi0v3/gDQWfljwhFSApx4fFJnFAKpDseGVVhwqttXa PAvlm00PFAS5ARlN4la2wByd8b6rVcttAHebLhK4LX8bGv7HM/VRDPDYhLx1H9r+pAtcs6 q3gi1TXX5L4VmbomT5P0ryVYCSGobio/GNIwEP5HoLF4Rr9bmd3Gr5/dLdjbm8PEhzKRNs gIkEK3MsEWLOfbSOBy6JZ4CfdhkLEp/tUgw0o8JSBszaq/16nl5mbhLK7EmZTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9vBp1JXszlr6 for ; Wed, 11 Feb 2026 10:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c99d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 10:03:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 0233e3f8953b - stable/15 - lagg: Remove the member pr_num from struct lagg_proto 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0233e3f8953bbc789f30a977220836fa7723def5 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 10:03:14 +0000 Message-Id: <698c53e2.1c99d.711b281c@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0233e3f8953bbc789f30a977220836fa7723def5 commit 0233e3f8953bbc789f30a977220836fa7723def5 Author: Zhenlei Huang AuthorDate: 2026-02-06 03:37:43 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-11 10:00:44 +0000 lagg: Remove the member pr_num from struct lagg_proto It is set but never used. Remove it to avoid confusion and save a little space. While here, use designated initializers to initialize the LAGG protocol table. That improves readability, and it will be safer to initialize the table if we introduce new protocols in the future. No functional change intended. Reviewed by: glebius MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D55124 (cherry picked from commit 5ba503fc2cabc1a614997f102ace671d996bcc53) --- sys/net/if_lagg.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 21ea2b30459b..1e4d3d8d85ac 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -208,7 +208,6 @@ static struct mbuf *lagg_default_input(struct lagg_softc *, struct lagg_port *, /* lagg protocol table */ static const struct lagg_proto { - lagg_proto pr_num; void (*pr_attach)(struct lagg_softc *); void (*pr_detach)(struct lagg_softc *); int (*pr_start)(struct lagg_softc *, struct mbuf *); @@ -223,24 +222,20 @@ static const struct lagg_proto { void (*pr_request)(struct lagg_softc *, void *); void (*pr_portreq)(struct lagg_port *, void *); } lagg_protos[] = { - { - .pr_num = LAGG_PROTO_NONE, + [LAGG_PROTO_NONE] = { .pr_start = lagg_none_start, .pr_input = lagg_none_input, }, - { - .pr_num = LAGG_PROTO_ROUNDROBIN, + [LAGG_PROTO_ROUNDROBIN] = { .pr_attach = lagg_rr_attach, .pr_start = lagg_rr_start, .pr_input = lagg_default_input, }, - { - .pr_num = LAGG_PROTO_FAILOVER, + [LAGG_PROTO_FAILOVER] = { .pr_start = lagg_fail_start, .pr_input = lagg_fail_input, }, - { - .pr_num = LAGG_PROTO_LOADBALANCE, + [LAGG_PROTO_LOADBALANCE] = { .pr_attach = lagg_lb_attach, .pr_detach = lagg_lb_detach, .pr_start = lagg_lb_start, @@ -248,8 +243,7 @@ static const struct lagg_proto { .pr_addport = lagg_lb_port_create, .pr_delport = lagg_lb_port_destroy, }, - { - .pr_num = LAGG_PROTO_LACP, + [LAGG_PROTO_LACP] = { .pr_attach = lagg_lacp_attach, .pr_detach = lagg_lacp_detach, .pr_start = lagg_lacp_start, @@ -263,8 +257,7 @@ static const struct lagg_proto { .pr_request = lacp_req, .pr_portreq = lacp_portreq, }, - { - .pr_num = LAGG_PROTO_BROADCAST, + [LAGG_PROTO_BROADCAST] = { .pr_start = lagg_bcast_start, .pr_input = lagg_default_input, },