wifi: mac80211: provide link ID in link_conf

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@intel.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 044ed417b06f2369933af95b3c0fbb18288f59a9..877b3eca6db4485be0b18cfe5c1e709677325bfc 100644 (file)
--- 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 fbb9c9c291b97ad5be95b133df51cd22b35f55c7..312a812bec84d6a069c31e8a74afb739ea619eae 100644 (file)
--- 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);