2022-07-08 12:31:07

by Veerendranath Jakkam

Subject: [PATCH v2] wifi: nl80211: fix sending link ID info of associated BSS

commit dd374f84baec ("wifi: nl80211: expose link ID for associated
BSSes") used a top-level attribute to send link ID of the associated
BSS in the nested attribute NL80211_ATTR_BSS. But since NL80211_ATTR_BSS
is a nested attribute of the attributes defined in enum nl80211_bss,
define a new attribute in enum nl80211_bss and use it for sending the
link ID of the BSS.

Fixes: dd374f84baec ("wifi: nl80211: expose link ID for associated BSSes")
Signed-off-by: Veerendranath Jakkam <[email protected]>
---
v2:
- Write more appropriate and detailed commit text
---
include/uapi/linux/nl80211.h | 2 ++
net/wireless/nl80211.c | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 279f9715919e..7bb1ae59f3a5 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -4904,6 +4904,7 @@ enum nl80211_bss_scan_width {
* Contains a nested array of signal strength attributes (u8, dBm),
* using the nesting index as the antenna number.
* @NL80211_BSS_FREQUENCY_OFFSET: frequency offset in KHz
+ * @NL80211_BSS_MLO_LINK_ID: MLO link ID of the BSS (u8).
* @__NL80211_BSS_AFTER_LAST: internal
* @NL80211_BSS_MAX: highest BSS attribute
*/
@@ -4929,6 +4930,7 @@ enum nl80211_bss {
NL80211_BSS_PARENT_BSSID,
NL80211_BSS_CHAIN_SIGNAL,
NL80211_BSS_FREQUENCY_OFFSET,
+ NL80211_BSS_MLO_LINK_ID,

/* keep last */
__NL80211_BSS_AFTER_LAST,
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index eda2ad029c90..5d6351d3a484 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -9991,7 +9991,8 @@ static int nl80211_send_bss(struct sk_buff *msg, struct netlink_callback *cb,
(nla_put_u32(msg, NL80211_BSS_STATUS,
NL80211_BSS_STATUS_ASSOCIATED) ||
(wdev->valid_links &&
- nla_put_u8(msg, NL80211_ATTR_MLO_LINK_ID, link_id))))
+ nla_put_u8(msg, NL80211_BSS_MLO_LINK_ID,
+ link_id))))
goto nla_put_failure;
}
break;
--
2.25.1

2022-07-08 19:28:48

by Jeff Johnson

Subject: Re: [PATCH v2] wifi: nl80211: fix sending link ID info of associated BSS

On 7/8/2022 5:26 AM, Veerendranath Jakkam wrote:
> commit dd374f84baec ("wifi: nl80211: expose link ID for associated
> BSSes") used a top-level attribute to send link ID of the associated
> BSS in the nested attribute NL80211_ATTR_BSS. But since NL80211_ATTR_BSS
> is a nested attribute of the attributes defined in enum nl80211_bss,
> define a new attribute in enum nl80211_bss and use it for sending the
> link ID of the BSS.
>
> Fixes: dd374f84baec ("wifi: nl80211: expose link ID for associated BSSes")
> Signed-off-by: Veerendranath Jakkam <[email protected]>

Reviewed-by: Jeff Johnson <[email protected]>