mac80211: propagate multi bssid settings when starting an AP

This patch extends the bss_config allowing us to propagate the multiple
bssid setting down the stack into the driver.

Signed-off-by: John Crispin <john@phrozen.org>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 67729b8fcdb294bc35aee2fe494e1e1797a7920a..d7dce78e261e737f37368965068684375dff9d7f 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -607,6 +607,7 @@ struct ieee80211_ftm_responder_params {
  * @he_oper: HE operation information of the AP we are connected to
  * @he_obss_pd: OBSS Packet Detection parameters.
  * @he_bss_color: BSS coloring settings, if BSS supports HE
+ * @multi_bssid: the multi bssid settings of the AP.
  */
 struct ieee80211_bss_conf {
        const u8 *bssid;
@@ -674,6 +675,7 @@ struct ieee80211_bss_conf {
        } he_oper;
        struct ieee80211_he_obss_pd he_obss_pd;
        struct cfg80211_he_bss_color he_bss_color;
+       struct ieee80211_multi_bssid multi_bssid;
 };
 
 /**

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index c1442a7d1f4931eeecc14c5c62365da3d59b0d7e..40833499304587e9f2fe911dbba79125d2affe12 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1130,6 +1130,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
               sizeof(struct ieee80211_he_obss_pd));
        memcpy(&sdata->vif.bss_conf.he_bss_color, &params->he_bss_color,
               sizeof(struct ieee80211_he_bss_color));
+       memcpy(&sdata->vif.bss_conf.multi_bssid, &params->multi_bssid,
+              sizeof(struct ieee80211_multi_bssid));
 
        sdata->vif.bss_conf.ssid_len = params->ssid_len;
        if (params->ssid_len)