mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 22:26:55 +00:00
Code Issues Releases Wiki Activity

mac80211: MBSSID support in interface handling

Browse source 
Configure multiple BSSID and enhanced multi-BSSID advertisement (EMA)
parameters in mac80211 for AP mode.

For each interface, 'mbssid_tx_vif' points to the transmitting interface of
the MBSSID set. The pointer is set to NULL if MBSSID is disabled.

Function ieee80211_stop() is modified to always bring down all the
non-transmitting interfaces first and the transmitting interface last.

Signed-off-by: John Crispin <john@phrozen.org>
Co-developed-by: Aloka Dixit <alokad@codeaurora.org>
Signed-off-by: Aloka Dixit <alokad@codeaurora.org>
Link: https://lore.kernel.org/r/20210916025437.29138-3-alokad@codeaurora.org
[slightly change logic to be more obvious]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
John Crispin 2021-09-15 19:54:35 -07:00 committed by Johannes Berg
parent dc1e3cb8da
commit 1719642521
3 changed files with 71 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/net/mac80211.h
View file

@ -1723,6 +1723,7 @@ enum ieee80211_offload_flags {
* write-protected by sdata_lock and local->mtx so holding either is fine
* for read access.
* @color_change_color: the bss color that will be used after the change.
* @mbssid_tx_vif: Pointer to the transmitting interface if MBSSID is enabled.
*/
struct ieee80211_vif {
enum nl80211_iftype type;
@ -1754,6 +1755,8 @@ struct ieee80211_vif {
bool color_change_active;
u8 color_change_color;
struct ieee80211_vif *mbssid_tx_vif;
/* must be last */
u8 drv_priv[] __aligned(sizeof(void *));
};

38
net/mac80211/cfg.c
View file

@ -111,6 +111,36 @@ static int ieee80211_set_mon_options(struct ieee80211_sub_if_data *sdata,
return 0;
}
static int ieee80211_set_ap_mbssid_options(struct ieee80211_sub_if_data *sdata,
struct cfg80211_mbssid_config params)
{
struct ieee80211_sub_if_data *tx_sdata;
sdata->vif.mbssid_tx_vif = NULL;
sdata->vif.bss_conf.bssid_index = 0;
sdata->vif.bss_conf.nontransmitted = false;
sdata->vif.bss_conf.ema_ap = false;
if (sdata->vif.type != NL80211_IFTYPE_AP || !params.tx_wdev)
return -EINVAL;
tx_sdata = IEEE80211_WDEV_TO_SUB_IF(params.tx_wdev);
if (!tx_sdata)
return -EINVAL;
if (tx_sdata == sdata) {
sdata->vif.mbssid_tx_vif = &sdata->vif;
} else {
sdata->vif.mbssid_tx_vif = &tx_sdata->vif;
sdata->vif.bss_conf.nontransmitted = true;
sdata->vif.bss_conf.bssid_index = params.index;
}
if (params.ema)
sdata->vif.bss_conf.ema_ap = true;
return 0;
}
static struct wireless_dev *ieee80211_add_iface(struct wiphy *wiphy,
const char *name,
unsigned char name_assign_type,
@ -1105,6 +1135,14 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
changed |= BSS_CHANGED_HE_BSS_COLOR;
}
if (sdata->vif.type == NL80211_IFTYPE_AP &&
params->mbssid_config.tx_wdev) {
err = ieee80211_set_ap_mbssid_options(sdata,
params->mbssid_config);
if (err)
return err;
}
mutex_lock(&local->mtx);
err = ieee80211_vif_use_channel(sdata, &params->chandef,
IEEE80211_CHANCTX_SHARED);

31
net/mac80211/iface.c
View file

@ -632,17 +632,46 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_do
ieee80211_add_virtual_monitor(local);
}
static void ieee80211_stop_mbssid(struct ieee80211_sub_if_data *sdata)
{
struct ieee80211_sub_if_data *tx_sdata, *non_tx_sdata, *tmp_sdata;
struct ieee80211_vif *tx_vif = sdata->vif.mbssid_tx_vif;
if (!tx_vif)
return;
tx_sdata = vif_to_sdata(tx_vif);
sdata->vif.mbssid_tx_vif = NULL;
list_for_each_entry_safe(non_tx_sdata, tmp_sdata,
&tx_sdata->local->interfaces, list) {
if (non_tx_sdata != sdata && non_tx_sdata != tx_sdata &&
non_tx_sdata->vif.mbssid_tx_vif == tx_vif &&
ieee80211_sdata_running(non_tx_sdata)) {
non_tx_sdata->vif.mbssid_tx_vif = NULL;
dev_close(non_tx_sdata->wdev.netdev);
}
}
if (sdata != tx_sdata && ieee80211_sdata_running(tx_sdata)) {
tx_sdata->vif.mbssid_tx_vif = NULL;
dev_close(tx_sdata->wdev.netdev);
}
}
static int ieee80211_stop(struct net_device *dev)
{
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
/* close all dependent VLAN interfaces before locking wiphy */
/* close dependent VLAN and MBSSID interfaces before locking wiphy */
if (sdata->vif.type == NL80211_IFTYPE_AP) {
struct ieee80211_sub_if_data *vlan, *tmpsdata;
list_for_each_entry_safe(vlan, tmpsdata, &sdata->u.ap.vlans,
u.vlan.list)
dev_close(vlan->dev);
ieee80211_stop_mbssid(sdata);
}
wiphy_lock(sdata->local->hw.wiphy);