mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 08:33:17 +02:00
mac80211: Unsolicited broadcast probe response support
This patch adds mac80211 support to configure unsolicited broadcast probe response transmission for in-band discovery in 6GHz. Changes include functions to store and retrieve probe response template, and packet interval (0 - 20 TUs). Setting interval to 0 disables the unsolicited broadcast probe response transmission. Signed-off-by: Aloka Dixit <alokad@codeaurora.org> Link: https://lore.kernel.org/r/010101747a946b35-ad25858a-1f1f-48df-909e-dc7bf26d9169-000000@us-west-2.amazonses.com Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
7443dcd1f1
commit
632189a018
|
|
@ -318,6 +318,8 @@ struct ieee80211_vif_chanctx_switch {
|
||||||
* @BSS_CHANGED_HE_OBSS_PD: OBSS Packet Detection status changed.
|
* @BSS_CHANGED_HE_OBSS_PD: OBSS Packet Detection status changed.
|
||||||
* @BSS_CHANGED_HE_BSS_COLOR: BSS Color has changed
|
* @BSS_CHANGED_HE_BSS_COLOR: BSS Color has changed
|
||||||
* @BSS_CHANGED_FILS_DISCOVERY: FILS discovery status changed.
|
* @BSS_CHANGED_FILS_DISCOVERY: FILS discovery status changed.
|
||||||
|
* @BSS_CHANGED_UNSOL_BCAST_PROBE_RESP: Unsolicited broadcast probe response
|
||||||
|
* status changed.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
enum ieee80211_bss_change {
|
enum ieee80211_bss_change {
|
||||||
|
|
@ -352,6 +354,7 @@ enum ieee80211_bss_change {
|
||||||
BSS_CHANGED_HE_OBSS_PD = 1<<28,
|
BSS_CHANGED_HE_OBSS_PD = 1<<28,
|
||||||
BSS_CHANGED_HE_BSS_COLOR = 1<<29,
|
BSS_CHANGED_HE_BSS_COLOR = 1<<29,
|
||||||
BSS_CHANGED_FILS_DISCOVERY = 1<<30,
|
BSS_CHANGED_FILS_DISCOVERY = 1<<30,
|
||||||
|
BSS_CHANGED_UNSOL_BCAST_PROBE_RESP = 1<<31,
|
||||||
|
|
||||||
/* when adding here, make sure to change ieee80211_reconfig */
|
/* when adding here, make sure to change ieee80211_reconfig */
|
||||||
};
|
};
|
||||||
|
|
@ -622,6 +625,8 @@ struct ieee80211_fils_discovery {
|
||||||
* @he_obss_pd: OBSS Packet Detection parameters.
|
* @he_obss_pd: OBSS Packet Detection parameters.
|
||||||
* @he_bss_color: BSS coloring settings, if BSS supports HE
|
* @he_bss_color: BSS coloring settings, if BSS supports HE
|
||||||
* @fils_discovery: FILS discovery configuration
|
* @fils_discovery: FILS discovery configuration
|
||||||
|
* @unsol_bcast_probe_resp_interval: Unsolicited broadcast probe response
|
||||||
|
* interval.
|
||||||
*/
|
*/
|
||||||
struct ieee80211_bss_conf {
|
struct ieee80211_bss_conf {
|
||||||
const u8 *bssid;
|
const u8 *bssid;
|
||||||
|
|
@ -690,6 +695,7 @@ struct ieee80211_bss_conf {
|
||||||
struct ieee80211_he_obss_pd he_obss_pd;
|
struct ieee80211_he_obss_pd he_obss_pd;
|
||||||
struct cfg80211_he_bss_color he_bss_color;
|
struct cfg80211_he_bss_color he_bss_color;
|
||||||
struct ieee80211_fils_discovery fils_discovery;
|
struct ieee80211_fils_discovery fils_discovery;
|
||||||
|
u32 unsol_bcast_probe_resp_interval;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -6656,4 +6662,18 @@ bool ieee80211_set_hw_80211_encap(struct ieee80211_vif *vif, bool enable);
|
||||||
*/
|
*/
|
||||||
struct sk_buff *ieee80211_get_fils_discovery_tmpl(struct ieee80211_hw *hw,
|
struct sk_buff *ieee80211_get_fils_discovery_tmpl(struct ieee80211_hw *hw,
|
||||||
struct ieee80211_vif *vif);
|
struct ieee80211_vif *vif);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ieee80211_get_unsol_bcast_probe_resp_tmpl - Get unsolicited broadcast
|
||||||
|
* probe response template.
|
||||||
|
* @hw: pointer obtained from ieee80211_alloc_hw().
|
||||||
|
* @vif: &struct ieee80211_vif pointer from the add_interface callback.
|
||||||
|
*
|
||||||
|
* The driver is responsible for freeing the returned skb.
|
||||||
|
*
|
||||||
|
* Return: Unsolicited broadcast probe response template. %NULL on error.
|
||||||
|
*/
|
||||||
|
struct sk_buff *
|
||||||
|
ieee80211_get_unsol_bcast_probe_resp_tmpl(struct ieee80211_hw *hw,
|
||||||
|
struct ieee80211_vif *vif);
|
||||||
#endif /* MAC80211_H */
|
#endif /* MAC80211_H */
|
||||||
|
|
|
||||||
|
|
@ -864,6 +864,32 @@ static int ieee80211_set_fils_discovery(struct ieee80211_sub_if_data *sdata,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
ieee80211_set_unsol_bcast_probe_resp(struct ieee80211_sub_if_data *sdata,
|
||||||
|
struct cfg80211_unsol_bcast_probe_resp *params)
|
||||||
|
{
|
||||||
|
struct unsol_bcast_probe_resp_data *new, *old = NULL;
|
||||||
|
|
||||||
|
if (!params->tmpl || !params->tmpl_len)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
old = sdata_dereference(sdata->u.ap.unsol_bcast_probe_resp, sdata);
|
||||||
|
new = kzalloc(sizeof(*new) + params->tmpl_len, GFP_KERNEL);
|
||||||
|
if (!new)
|
||||||
|
return -ENOMEM;
|
||||||
|
new->len = params->tmpl_len;
|
||||||
|
memcpy(new->data, params->tmpl, params->tmpl_len);
|
||||||
|
rcu_assign_pointer(sdata->u.ap.unsol_bcast_probe_resp, new);
|
||||||
|
|
||||||
|
if (old)
|
||||||
|
kfree_rcu(old, rcu_head);
|
||||||
|
|
||||||
|
sdata->vif.bss_conf.unsol_bcast_probe_resp_interval =
|
||||||
|
params->interval;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int ieee80211_set_ftm_responder_params(
|
static int ieee80211_set_ftm_responder_params(
|
||||||
struct ieee80211_sub_if_data *sdata,
|
struct ieee80211_sub_if_data *sdata,
|
||||||
const u8 *lci, size_t lci_len,
|
const u8 *lci, size_t lci_len,
|
||||||
|
|
@ -1138,6 +1164,14 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
|
||||||
changed |= BSS_CHANGED_FILS_DISCOVERY;
|
changed |= BSS_CHANGED_FILS_DISCOVERY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (params->unsol_bcast_probe_resp.interval) {
|
||||||
|
err = ieee80211_set_unsol_bcast_probe_resp(sdata,
|
||||||
|
¶ms->unsol_bcast_probe_resp);
|
||||||
|
if (err < 0)
|
||||||
|
goto error;
|
||||||
|
changed |= BSS_CHANGED_UNSOL_BCAST_PROBE_RESP;
|
||||||
|
}
|
||||||
|
|
||||||
err = drv_start_ap(sdata->local, sdata);
|
err = drv_start_ap(sdata->local, sdata);
|
||||||
if (err) {
|
if (err) {
|
||||||
old = sdata_dereference(sdata->u.ap.beacon, sdata);
|
old = sdata_dereference(sdata->u.ap.beacon, sdata);
|
||||||
|
|
@ -1197,6 +1231,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
|
||||||
struct beacon_data *old_beacon;
|
struct beacon_data *old_beacon;
|
||||||
struct probe_resp *old_probe_resp;
|
struct probe_resp *old_probe_resp;
|
||||||
struct fils_discovery_data *old_fils_discovery;
|
struct fils_discovery_data *old_fils_discovery;
|
||||||
|
struct unsol_bcast_probe_resp_data *old_unsol_bcast_probe_resp;
|
||||||
struct cfg80211_chan_def chandef;
|
struct cfg80211_chan_def chandef;
|
||||||
|
|
||||||
sdata_assert_lock(sdata);
|
sdata_assert_lock(sdata);
|
||||||
|
|
@ -1207,6 +1242,9 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
|
||||||
old_probe_resp = sdata_dereference(sdata->u.ap.probe_resp, sdata);
|
old_probe_resp = sdata_dereference(sdata->u.ap.probe_resp, sdata);
|
||||||
old_fils_discovery = sdata_dereference(sdata->u.ap.fils_discovery,
|
old_fils_discovery = sdata_dereference(sdata->u.ap.fils_discovery,
|
||||||
sdata);
|
sdata);
|
||||||
|
old_unsol_bcast_probe_resp =
|
||||||
|
sdata_dereference(sdata->u.ap.unsol_bcast_probe_resp,
|
||||||
|
sdata);
|
||||||
|
|
||||||
/* abort any running channel switch */
|
/* abort any running channel switch */
|
||||||
mutex_lock(&local->mtx);
|
mutex_lock(&local->mtx);
|
||||||
|
|
@ -1231,11 +1269,14 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
|
||||||
RCU_INIT_POINTER(sdata->u.ap.beacon, NULL);
|
RCU_INIT_POINTER(sdata->u.ap.beacon, NULL);
|
||||||
RCU_INIT_POINTER(sdata->u.ap.probe_resp, NULL);
|
RCU_INIT_POINTER(sdata->u.ap.probe_resp, NULL);
|
||||||
RCU_INIT_POINTER(sdata->u.ap.fils_discovery, NULL);
|
RCU_INIT_POINTER(sdata->u.ap.fils_discovery, NULL);
|
||||||
|
RCU_INIT_POINTER(sdata->u.ap.unsol_bcast_probe_resp, NULL);
|
||||||
kfree_rcu(old_beacon, rcu_head);
|
kfree_rcu(old_beacon, rcu_head);
|
||||||
if (old_probe_resp)
|
if (old_probe_resp)
|
||||||
kfree_rcu(old_probe_resp, rcu_head);
|
kfree_rcu(old_probe_resp, rcu_head);
|
||||||
if (old_fils_discovery)
|
if (old_fils_discovery)
|
||||||
kfree_rcu(old_fils_discovery, rcu_head);
|
kfree_rcu(old_fils_discovery, rcu_head);
|
||||||
|
if (old_unsol_bcast_probe_resp)
|
||||||
|
kfree_rcu(old_unsol_bcast_probe_resp, rcu_head);
|
||||||
|
|
||||||
kfree(sdata->vif.bss_conf.ftmr_params);
|
kfree(sdata->vif.bss_conf.ftmr_params);
|
||||||
sdata->vif.bss_conf.ftmr_params = NULL;
|
sdata->vif.bss_conf.ftmr_params = NULL;
|
||||||
|
|
|
||||||
|
|
@ -277,6 +277,12 @@ struct fils_discovery_data {
|
||||||
u8 data[];
|
u8 data[];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct unsol_bcast_probe_resp_data {
|
||||||
|
struct rcu_head rcu_head;
|
||||||
|
int len;
|
||||||
|
u8 data[];
|
||||||
|
};
|
||||||
|
|
||||||
struct ps_data {
|
struct ps_data {
|
||||||
/* yes, this looks ugly, but guarantees that we can later use
|
/* yes, this looks ugly, but guarantees that we can later use
|
||||||
* bitmap_empty :)
|
* bitmap_empty :)
|
||||||
|
|
@ -293,6 +299,7 @@ struct ieee80211_if_ap {
|
||||||
struct beacon_data __rcu *beacon;
|
struct beacon_data __rcu *beacon;
|
||||||
struct probe_resp __rcu *probe_resp;
|
struct probe_resp __rcu *probe_resp;
|
||||||
struct fils_discovery_data __rcu *fils_discovery;
|
struct fils_discovery_data __rcu *fils_discovery;
|
||||||
|
struct unsol_bcast_probe_resp_data __rcu *unsol_bcast_probe_resp;
|
||||||
|
|
||||||
/* to be used after channel switch. */
|
/* to be used after channel switch. */
|
||||||
struct cfg80211_beacon_data *next_beacon;
|
struct cfg80211_beacon_data *next_beacon;
|
||||||
|
|
|
||||||
|
|
@ -5027,6 +5027,35 @@ struct sk_buff *ieee80211_get_fils_discovery_tmpl(struct ieee80211_hw *hw,
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(ieee80211_get_fils_discovery_tmpl);
|
EXPORT_SYMBOL(ieee80211_get_fils_discovery_tmpl);
|
||||||
|
|
||||||
|
struct sk_buff *
|
||||||
|
ieee80211_get_unsol_bcast_probe_resp_tmpl(struct ieee80211_hw *hw,
|
||||||
|
struct ieee80211_vif *vif)
|
||||||
|
{
|
||||||
|
struct sk_buff *skb = NULL;
|
||||||
|
struct unsol_bcast_probe_resp_data *tmpl = NULL;
|
||||||
|
struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
|
||||||
|
|
||||||
|
if (sdata->vif.type != NL80211_IFTYPE_AP)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
rcu_read_lock();
|
||||||
|
tmpl = rcu_dereference(sdata->u.ap.unsol_bcast_probe_resp);
|
||||||
|
if (!tmpl) {
|
||||||
|
rcu_read_unlock();
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
skb = dev_alloc_skb(sdata->local->hw.extra_tx_headroom + tmpl->len);
|
||||||
|
if (skb) {
|
||||||
|
skb_reserve(skb, sdata->local->hw.extra_tx_headroom);
|
||||||
|
skb_put_data(skb, tmpl->data, tmpl->len);
|
||||||
|
}
|
||||||
|
|
||||||
|
rcu_read_unlock();
|
||||||
|
return skb;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(ieee80211_get_unsol_bcast_probe_resp_tmpl);
|
||||||
|
|
||||||
struct sk_buff *ieee80211_pspoll_get(struct ieee80211_hw *hw,
|
struct sk_buff *ieee80211_pspoll_get(struct ieee80211_hw *hw,
|
||||||
struct ieee80211_vif *vif)
|
struct ieee80211_vif *vif)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user