From nobody Wed Jun 12 16:41:21 2024 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 4VzrsG3BCFz5N3GR; Wed, 12 Jun 2024 16:41:22 +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 4VzrsF71wbz4gfy; Wed, 12 Jun 2024 16:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718210482; 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=+3u/RBonjeTYuGDbwfSTQK5xmnvBQySalsw6tUvw6Xw=; b=RSUhH8LjW9Xrm9EyWYokXQmbM+5OicBHok+bjPlKwRX8Xxj2AVIEaj5eZiRsisTlopFr0t 4WGI2/KyChrougOt0lWd+mw2GDkFyyMM7IZc6XUPJIpJBNiCeq+h9lVopjIuZCGCMxaFww HFudEL/wGvMJu8hM/tgB9MsVdpdbdKszHLg0SfafbFL4nslXJcyIq9uroxnyDqYHvhSa9L mMopyvKK1QOKus/vLr91tWj61PEfD5xlloC1x6yRIegkFf1aJCkdhiFa6wHO+F+xrVXkZK XBRtI5QmwIGbYz1Yk67AxiGZ7HWMpn2rKGz5e4atg1ovF26K0cVVoHTb9GbxIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718210482; a=rsa-sha256; cv=none; b=meI/vF+jH6AEzV4vGVVJCq/2A7K8O1noSpteRZBCeher3YmSgVpg8a4qtsm5u49CAKFXCb 1r3DLLZO3daXbmG7T4htGrh4bG2ADPlYK9js51nO+Pt2u6kj0hmX6pOJvn3F+pgtp7nKK9 WfvPPCi7s3zb34Sw6ZrgM2z9dBSdzTbJFttQ/nqfJQNm8fea/GoUKZ46utPnzswhciD1G4 l/SCDAUWQlo9huyUVR+TfHsJ3S1uKlj6igT7fxLmL8qM5adYos3767otHWhhrNXvVKjz4f O6QwXTFXAFw1OUXKp4XFi+Rf9uI5iZJQ3CirS2pW5R6Bsyigt8ZUgM3uFt1O8g== 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=1718210482; 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=+3u/RBonjeTYuGDbwfSTQK5xmnvBQySalsw6tUvw6Xw=; b=qZJtVB5ZMhaFxaGlv3ouMgCVuWOmKmpmZYKaHoIwa63zhrxpmstoPoCFJXZxBvjvYMrWs9 5Ppjo095AzceIFxDHaL999+qhgGM0ppU/qjQZxcOmE0W4OlJngRISWDQuYxmq9qDuXYJOa hel9hrfLbzgYv5+b7/SGqF3zXyvyGxTdlxIEFCxMTx7I2ZOcNCWewRPnlDbwd6VI3Tx+ru TRjNuy+B6FlF0IRDfSGxT9+gqfakrXJNtj1xci33CSbHPTjSXN9ZNjOWnt9rfHENtIKoun 0jpBL9VLZvt2PrlsjbFLZm39UQNpK5A2cr0AYC+VMBZkfMauvFkkLvR5mddaXg== 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 4VzrsF6f9Kz11Hh; Wed, 12 Jun 2024 16:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45CGfLD2046619; Wed, 12 Jun 2024 16:41:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CGfLKN046616; Wed, 12 Jun 2024 16:41:21 GMT (envelope-from git) Date: Wed, 12 Jun 2024 16:41:21 GMT Message-Id: <202406121641.45CGfLKN046616@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: eef52bbe9cb4 - stable/14 - LinuxKPI: 802.11: fix for_each_sta_active_link() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eef52bbe9cb44616116fab65f9bbf16d1e2d43ef Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=eef52bbe9cb44616116fab65f9bbf16d1e2d43ef commit eef52bbe9cb44616116fab65f9bbf16d1e2d43ef Author: Bjoern A. Zeeb AuthorDate: 2024-05-21 21:58:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-06-12 13:58:30 +0000 LinuxKPI: 802.11: fix for_each_sta_active_link() Likely a c&p error from for_each_vif_active_link() to for_each_sta_active_link(). We are checking the nitems on the vif instead of the sta in this macro. Function wise there is no difference as the arrays are the same size but for correctness fix this. Sponsored by: The FreeBSD Foundation (cherry picked from commit 69b6c4a6ec6654978628ccd48edce46f00ac3e96) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index fc9d7829dae3..6a477ae5c32a 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1253,7 +1253,7 @@ ieee80211_hw_restart_disconnect(struct ieee80211_vif *vif) (_link = rcu_dereference((_vif)->link_conf[_linkid])) ) #define for_each_sta_active_link(_vif, _sta, _linksta, _linkid) \ - for (_linkid = 0; _linkid < nitems((_vif)->link_conf); _linkid++) \ + for (_linkid = 0; _linkid < nitems((_sta)->link); _linkid++) \ if ( ((_vif)->active_links == 0 /* no MLO */ || \ ((_vif)->active_links & BIT(_linkid)) != 0) && \ (_linksta = link_sta_dereference_protected((_sta), (_linkid))) )