From nobody Wed Jun 12 19:16:55 2024 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 4VzwJl6D3fz5NHfG; Wed, 12 Jun 2024 19:16:55 +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 4VzwJl4Nr9z576B; Wed, 12 Jun 2024 19:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718219815; 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=yZJpUdd3CVsMEb3R3z+pY5xD7fxu2fgPsas+0NpGOrs=; b=aTi66ABwVCkFZqKd6s+4uitsbadr6LcCLNuQ25bGIQ6TzzezGWc61kaHZ3wkIwZbA8rHHc PFP3R9gJjFfoQrxQV14tO5QGpsdFttWkkSNYc+jq0OtR1Z6OczDJ+gdwMgcgL4zb/qCZoj 8I6neCE9bH5qJgN/PDIajaIELmC5XGsYOe5TuNng0B0XspUje7J6sZW4BNjalCWzZTnXMK lLq81CaYguzbpY/UEZ3qM4Mx38p8kGWbhrtJ2pNK677PLHxOp6oatuu0XUfDanEVs+/oIx 5a1Lwr1JtTcipnHTU2YgeO79HuF/OOwccjmPcKvfu4neZZwKHtCy9SbZZWvyIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718219815; a=rsa-sha256; cv=none; b=SJL4Aba3MtkjkOOS2q+6JMIbc/E45y0FZXcNcCBgn5Qa1l/3bR2nTM7sSjskk+eOYmMIS7 fZcZ3SocyCE89laqIgLHAEVGyTGYIl8qVdQQZmS9rV9m/PP1HIEK27tnquFBnrNXytV25X D3YmIqWgg+KRcI+WULAQWP9LB1HWXvXSUWdOoCmimGE6TrgRPDwW6CL4nmog1jpnqswUPy Cu6kTSuC1KyinGRkEDLz8wLIN4YuU+ERtqSeiI2td/uppQZegjsrNlmbMe33qAF1ysxmWC DFHSLJS32Ow3fsVvhypjZzR+v2a8tgcr1moHMBRTBG+dXkXRA5HajIWk3IuzaQ== 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=1718219815; 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=yZJpUdd3CVsMEb3R3z+pY5xD7fxu2fgPsas+0NpGOrs=; b=ClBTzNWP+iBppBM5/axoFvDfHVyqd5d8oiMsHjDlBAWkj7bf4JuH4d9ufERK40g1jlEnEc 5QZbMbWyPzfgwoVtD3Xs4rwiMJ2BqmXbT2yEpitJca+oWu/Z//VRQyy/gOHkq9rqx8mUh1 r+NO/eEL1zxoyqe63NAqLlRW3NdWAAG4/OU3IMLpp/kg8v25IeaiJ6ctpiJR+1zdke0O/F fzO6KzCdi32ezSYq3AQaPpK+3mGPKZGxWITZfdNM9yFJ2kxkk4lBJtguFmKR9n87wjQsS9 z/NPI2Fa+0+s0F+WDUu0zRVLaWnyRqszhh6Fli57BOroTrlg5QF65tka+KkQFg== 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 4VzwJl3ydfz14xK; Wed, 12 Jun 2024 19:16:55 +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 45CJGtI3004314; Wed, 12 Jun 2024 19:16:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CJGti7004311; Wed, 12 Jun 2024 19:16:55 GMT (envelope-from git) Date: Wed, 12 Jun 2024 19:16:55 GMT Message-Id: <202406121916.45CJGti7004311@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: 1c17a175c4c1 - stable/13 - LinuxKPI: 802.11: fix for_each_sta_active_link() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1c17a175c4c1b9f0cd995d77e3015698e3e174a9 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1c17a175c4c1b9f0cd995d77e3015698e3e174a9 commit 1c17a175c4c1b9f0cd995d77e3015698e3e174a9 Author: Bjoern A. Zeeb AuthorDate: 2024-05-21 21:58:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-06-12 17:00:49 +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))) )