Skip to content

Commit 7443dcd

Browse files
Aloka Dixitjmberg-intel
Aloka Dixit
authored and
jmberg-intel
committed
nl80211: Unsolicited broadcast probe response support
This patch adds new attributes to support unsolicited broadcast probe response transmission used for in-band discovery in 6GHz band (IEEE P802.11ax/D6.0 26.17.2.3.2, AP behavior for fast passive scanning). The new attribute, NL80211_ATTR_UNSOL_BCAST_PROBE_RESP, is nested which supports following parameters: (1) NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT - Packet interval (2) NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL - Template data Signed-off-by: Aloka Dixit <[email protected]> Link: https://lore.kernel.org/r/010101747a946698-aac263ae-2ed3-4dab-9590-0bc7131214e1-000000@us-west-2.amazonses.com Signed-off-by: Johannes Berg <[email protected]>
1 parent 295b02c commit 7443dcd

File tree

3 files changed

+100
-0
lines changed

3 files changed

+100
-0
lines changed

‎include/net/cfg80211.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,6 +1099,22 @@ struct cfg80211_fils_discovery {
10991099
const u8 *tmpl;
11001100
};
11011101

1102+
/**
1103+
* struct cfg80211_unsol_bcast_probe_resp - Unsolicited broadcast probe
1104+
* response parameters in 6GHz.
1105+
*
1106+
* @interval: Packet interval in TUs. Maximum allowed is 20 TU, as mentioned
1107+
* in IEEE P802.11ax/D6.0 26.17.2.3.2 - AP behavior for fast passive
1108+
* scanning
1109+
* @tmpl_len: Template length
1110+
* @tmpl: Template data for probe response
1111+
*/
1112+
struct cfg80211_unsol_bcast_probe_resp {
1113+
u32 interval;
1114+
size_t tmpl_len;
1115+
const u8 *tmpl;
1116+
};
1117+
11021118
/**
11031119
* enum cfg80211_ap_settings_flags - AP settings flags
11041120
*
@@ -1147,6 +1163,7 @@ enum cfg80211_ap_settings_flags {
11471163
* @he_bss_color: BSS Color settings
11481164
* @he_oper: HE operation IE (or %NULL if HE isn't enabled)
11491165
* @fils_discovery: FILS discovery transmission parameters
1166+
* @unsol_bcast_probe_resp: Unsolicited broadcast probe response parameters
11501167
*/
11511168
struct cfg80211_ap_settings {
11521169
struct cfg80211_chan_def chandef;
@@ -1178,6 +1195,7 @@ struct cfg80211_ap_settings {
11781195
struct ieee80211_he_obss_pd he_obss_pd;
11791196
struct cfg80211_he_bss_color he_bss_color;
11801197
struct cfg80211_fils_discovery fils_discovery;
1198+
struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp;
11811199
};
11821200

11831201
/**

‎include/uapi/linux/nl80211.h

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2517,6 +2517,10 @@ enum nl80211_commands {
25172517
* discovery. It is a nested attribute, see
25182518
* &enum nl80211_fils_discovery_attributes.
25192519
*
2520+
* @NL80211_ATTR_UNSOL_BCAST_PROBE_RESP: Optional parameter to configure
2521+
* unsolicited broadcast probe response. It is a nested attribute, see
2522+
* &enum nl80211_unsol_bcast_probe_resp_attributes.
2523+
*
25202524
* @NUM_NL80211_ATTR: total number of nl80211_attrs available
25212525
* @NL80211_ATTR_MAX: highest attribute number currently defined
25222526
* @__NL80211_ATTR_AFTER_LAST: internal use
@@ -3001,6 +3005,8 @@ enum nl80211_attrs {
30013005

30023006
NL80211_ATTR_FILS_DISCOVERY,
30033007

3008+
NL80211_ATTR_UNSOL_BCAST_PROBE_RESP,
3009+
30043010
/* add attributes here, update the policy in nl80211.c */
30053011

30063012
__NL80211_ATTR_AFTER_LAST,
@@ -5876,6 +5882,9 @@ enum nl80211_feature_flags {
58765882
* @NL80211_EXT_FEATURE_FILS_DISCOVERY: Driver/device supports FILS discovery
58775883
* frames transmission
58785884
*
5885+
* @NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP: Driver/device supports
5886+
* unsolicited broadcast probe response transmission
5887+
*
58795888
* @NUM_NL80211_EXT_FEATURES: number of extended features.
58805889
* @MAX_NL80211_EXT_FEATURES: highest extended feature index.
58815890
*/
@@ -5935,6 +5944,7 @@ enum nl80211_ext_feature_index {
59355944
NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK,
59365945
NL80211_EXT_FEATURE_SAE_OFFLOAD_AP,
59375946
NL80211_EXT_FEATURE_FILS_DISCOVERY,
5947+
NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP,
59385948

59395949
/* add new features before the definition below */
59405950
NUM_NL80211_EXT_FEATURES,
@@ -7063,4 +7073,30 @@ enum nl80211_fils_discovery_attributes {
70637073
*/
70647074
#define NL80211_FILS_DISCOVERY_TMPL_MIN_LEN 42
70657075

7076+
/**
7077+
* enum nl80211_unsol_bcast_probe_resp_attributes - Unsolicited broadcast probe
7078+
* response configuration. Applicable only in 6GHz.
7079+
*
7080+
* @__NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INVALID: Invalid
7081+
*
7082+
* @NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT: Maximum packet interval (u32, TU).
7083+
* Allowed range: 0..20 (TU = Time Unit). IEEE P802.11ax/D6.0
7084+
* 26.17.2.3.2 (AP behavior for fast passive scanning).
7085+
* @NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL: Unsolicited broadcast probe response
7086+
* frame template (binary).
7087+
*
7088+
* @__NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_LAST: Internal
7089+
* @NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_MAX: highest attribute
7090+
*/
7091+
enum nl80211_unsol_bcast_probe_resp_attributes {
7092+
__NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INVALID,
7093+
7094+
NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT,
7095+
NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL,
7096+
7097+
/* keep last */
7098+
__NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_LAST,
7099+
NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_MAX =
7100+
__NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_LAST - 1
7101+
};
70667102
#endif /* __LINUX_NL80211_H */

‎net/wireless/nl80211.c

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,13 @@ nl80211_fils_discovery_policy[NL80211_FILS_DISCOVERY_ATTR_MAX + 1] = {
385385
IEEE80211_MAX_DATA_LEN),
386386
};
387387

388+
static const struct nla_policy
389+
nl80211_unsol_bcast_probe_resp_policy[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_MAX + 1] = {
390+
[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT] = NLA_POLICY_MAX(NLA_U32, 20),
391+
[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL] = { .type = NLA_BINARY,
392+
.len = IEEE80211_MAX_DATA_LEN }
393+
};
394+
388395
static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
389396
[0] = { .strict_start_type = NL80211_ATTR_HE_OBSS_PD },
390397
[NL80211_ATTR_WIPHY] = { .type = NLA_U32 },
@@ -695,6 +702,8 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
695702
NLA_POLICY_EXACT_LEN(sizeof(struct ieee80211_he_6ghz_capa)),
696703
[NL80211_ATTR_FILS_DISCOVERY] =
697704
NLA_POLICY_NESTED(nl80211_fils_discovery_policy),
705+
[NL80211_ATTR_UNSOL_BCAST_PROBE_RESP] =
706+
NLA_POLICY_NESTED(nl80211_unsol_bcast_probe_resp_policy),
698707
};
699708

700709
/* policy for the key attributes */
@@ -4915,6 +4924,35 @@ static int nl80211_parse_fils_discovery(struct cfg80211_registered_device *rdev,
49154924
return 0;
49164925
}
49174926

4927+
static int
4928+
nl80211_parse_unsol_bcast_probe_resp(struct cfg80211_registered_device *rdev,
4929+
struct nlattr *attrs,
4930+
struct cfg80211_ap_settings *params)
4931+
{
4932+
struct nlattr *tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_MAX + 1];
4933+
int ret;
4934+
struct cfg80211_unsol_bcast_probe_resp *presp =
4935+
&params->unsol_bcast_probe_resp;
4936+
4937+
if (!wiphy_ext_feature_isset(&rdev->wiphy,
4938+
NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP))
4939+
return -EINVAL;
4940+
4941+
ret = nla_parse_nested(tb, NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_MAX,
4942+
attrs, NULL, NULL);
4943+
if (ret)
4944+
return ret;
4945+
4946+
if (!tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT] ||
4947+
!tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL])
4948+
return -EINVAL;
4949+
4950+
presp->tmpl = nla_data(tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL]);
4951+
presp->tmpl_len = nla_len(tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL]);
4952+
presp->interval = nla_get_u32(tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT]);
4953+
return 0;
4954+
}
4955+
49184956
static void nl80211_check_ap_rate_selectors(struct cfg80211_ap_settings *params,
49194957
const u8 *rates)
49204958
{
@@ -5231,6 +5269,14 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
52315269
goto out;
52325270
}
52335271

5272+
if (info->attrs[NL80211_ATTR_UNSOL_BCAST_PROBE_RESP]) {
5273+
err = nl80211_parse_unsol_bcast_probe_resp(
5274+
rdev, info->attrs[NL80211_ATTR_UNSOL_BCAST_PROBE_RESP],
5275+
&params);
5276+
if (err)
5277+
return err;
5278+
}
5279+
52345280
nl80211_calculate_ap_params(&params);
52355281

52365282
if (info->attrs[NL80211_ATTR_EXTERNAL_AUTH_SUPPORT])

0 commit comments

Comments
 (0)