From nobody Tue May 21 22:13:15 2024 X-Original-To: dev-commits-src-main@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 4VkTGM5xZzz5Kh7R; Tue, 21 May 2024 22:13:15 +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 4VkTGM5R17z4TsQ; Tue, 21 May 2024 22:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716329595; 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=xSbG6mVA43ZWH9Kjk4qK8iF9hj8Uh3mgTcCxn+te/o0=; b=aSA2+heRVOI3Y7CaIOgtDNSc0p0nP3Rj1ji4PrK+miHyCwBrut5NMqdrPGLAIsAfXiKMQH zgQtWbLTdAW9yoGtfPXgdNEIuDgrqHREUJAcwh8Cq+gZVvFz2IkhrppOkg+d8lZhJ9v8zl kSZqueARMxVx6jifxrtb/QnCAkZ3aVavIQeCDMMSnTLAK6G9fsFpc1DmX/j2b23Qj3hrsw UB1gFSjiN53wsvVxg3uQuF1yVg12dKbsw4HhFIlBJ2vsisno/URN8/iBTspGMB/Xf4Sa5u gO9WnNQUcrk4bmIHpwU8fhk6LqHk0gEjyUkw5kbYDA9mRZI98yIOtqnnFqUEjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716329595; a=rsa-sha256; cv=none; b=rsDwxPuC4IMb9M9E4mbtiHrlWVZdPDIA0WzJXivQM2X3jKu8iVD4UEp/ZUPk71VSxOAuXp 1ruraerOwzNBmgrxVzhVxdab2hiRkEzUb5UArI8ZT6bvFbN426Ta0x6tJxKU8S/5NDOk5d 6zcno+xIotxq+evmY8cuLGcXxNj/D66P2HNSS6Aw1S3cv57o4an9MoZcb6wa/QV2+TVbvH ryfiZqXDko15fbVmJk5P6FeNzWNwQMigJEe8z68i2ZoBaU7e5gdRwSRVcTQexhmeheLyD2 wiSAXFB5d1GK8lDy84FodKduDuf4r5A7B7c32Tzd8TRkz4JIR2dFgxYLWz7eqg== 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=1716329595; 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=xSbG6mVA43ZWH9Kjk4qK8iF9hj8Uh3mgTcCxn+te/o0=; b=UAbEYUEstSdEmpQ2+Z5TfcJZ8+1J+h+cqsGoRdZMPr72+xzo4Q4q7JURDZNUnvsV1w0WyN Or/Mx2z0yq2oUJm41SS4IDOFQmrtbSq+u0CeoAXkCEVJLiNtTIbFYEgLLy67Y977OdknnA fZKvXQpmOwrQKk2NzujT3ZhI5pG/4sUWdLgyh6UITVzpFu6/YE+YL1c+jAvOkurDT7jKXi pJIxwHzC7eJDauiM66AeYO6GT0MuOFSnaZcE+2Lxir3CYuJUATX4XE1RQn3wHPNDPp63MX C7vTahO/Upr/woyHBoyuVmjp3h2o6A+lV9RxfgnDtXFzF0ZxstC6rsG9srO36Q== 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 4VkTGM52Zdzfp9; Tue, 21 May 2024 22:13:15 +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 44LMDFxU061636; Tue, 21 May 2024 22:13:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44LMDFoS061633; Tue, 21 May 2024 22:13:15 GMT (envelope-from git) Date: Tue, 21 May 2024 22:13:15 GMT Message-Id: <202405212213.44LMDFoS061633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 69b6c4a6ec66 - main - LinuxKPI: 802.11: fix for_each_sta_active_link() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 69b6c4a6ec6654978628ccd48edce46f00ac3e96 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=69b6c4a6ec6654978628ccd48edce46f00ac3e96 commit 69b6c4a6ec6654978628ccd48edce46f00ac3e96 Author: Bjoern A. Zeeb AuthorDate: 2024-05-21 21:58:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-05-21 22:12:00 +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 MFC after: 3 days --- 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))) )