From: Johannes Berg <johannes.berg@xxxxxxxxx>
It might be useful to drivers to be able to pass only the
link_conf pointer, rather than both the pointer and the
link_id; add the link_id to the link_conf to facility that.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
---
include/net/mac80211.h | 2 ++
net/mac80211/iface.c | 1 +
2 files changed, 3 insertions(+)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index e6c77e12f94a..f917f7d7614e 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -516,6 +516,7 @@ struct ieee80211_fils_discovery {
* to that BSS) that can change during the lifetime of the BSS.
*
* @addr: (link) address used locally
+ * @link_id: link ID, or 0 for non-MLO
* @htc_trig_based_pkt_ext: default PE in 4us units, if BSS supports HE
* @uora_exists: is the UORA element advertised by AP
* @ack_enabled: indicates support to receive a multi-TID that solicits either
@@ -639,6 +640,7 @@ struct ieee80211_fils_discovery {
*/
struct ieee80211_bss_conf {
const u8 *bssid;
+ unsigned int link_id;
u8 addr[ETH_ALEN] __aligned(2);
u8 htc_trig_based_pkt_ext;
bool uora_exists;
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 3e1d46119f7a..28fe0735b9a8 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -390,6 +390,7 @@ static void ieee80211_link_init(struct ieee80211_sub_if_data *sdata,
link->sdata = sdata;
link->link_id = link_id;
link->conf = link_conf;
+ link_conf->link_id = link_id;
INIT_WORK(&link->csa_finalize_work,
ieee80211_csa_finalize_work);
--
2.36.1
