@@ -2326,12 +2326,41 @@ struct mpath_info {
int generation;
};
+/**
+ * enum cfg80211_bss_params_changed - BSS parameters that are being changed
+ *
+ * This enum provides information of all BSS parameters that
+ * have to be updated as part of change_bss() call.
+ *
+ * @CFG80211_BSS_PARAM_CHANGED_CTS_PROT: Indicates that CTS Protection changed.
+ * @CFG80211_BSS_PARAM_CHANGED_SHORT_PREAMBLE: Indicates that preamble changed.
+ * @CFG80211_BSS_PARAM_CHANGED_SHORT_SLOT_TIME: Indicates that slot timing changed.
+ * @CFG80211_BSS_PARAM_CHANGED_BASIC_RATES: Indicatesthat Basic Rateset changed.
+ * @CFG80211_BSS_PARAM_CHANGED_AP_ISOLATE: Indicates that AP Isolation setting changed.
+ * @CFG80211_BSS_PARAM_CHANGED_HT_OPMODE: Indicates that HT mode to be changed.
+ * @CFG80211_BSS_PARAM_CHANGED_P2P_CTWINDOW: Indicates that P2P CTWindow changed.
+ * @CFG80211_BSS_PARAM_CHANGED_P2P_OPPPS: Indicates that P2P Opportunistic
+ * Power Save Mode changed.
+ */
+enum cfg80211_bss_params_changed {
+ CFG80211_BSS_PARAM_CHANGED_CTS_PROT = BIT(0),
+ CFG80211_BSS_PARAM_CHANGED_SHORT_PREAMBLE = BIT(1),
+ CFG80211_BSS_PARAM_CHANGED_SHORT_SLOT_TIME = BIT(2),
+ CFG80211_BSS_PARAM_CHANGED_BASIC_RATES = BIT(3),
+ CFG80211_BSS_PARAM_CHANGED_AP_ISOLATE = BIT(4),
+ CFG80211_BSS_PARAM_CHANGED_HT_OPMODE = BIT(5),
+ CFG80211_BSS_PARAM_CHANGED_P2P_CTWINDOW = BIT(6),
+ CFG80211_BSS_PARAM_CHANGED_P2P_OPPPS = BIT(7),
+};
+
/**
* struct bss_parameters - BSS parameters
*
* Used to change BSS parameters (mainly for AP mode).
*
* @link_id: link_id or -1 for non-MLD
+ * @changed: bitmask of BSS parameters being changed by the user,
+ * see &enum cfg80211_bss_params_changed.
* @use_cts_prot: Whether to use CTS protection
* (0 = no, 1 = yes, -1 = do not change)
* @use_short_preamble: Whether the use of short preambles is allowed
@@ -2350,6 +2379,7 @@ struct mpath_info {
*/
struct bss_parameters {
int link_id;
+ u32 changed;
int use_cts_prot;
int use_short_preamble;
int use_short_slot_time;
@@ -8243,26 +8243,42 @@ static int nl80211_set_bss(struct sk_buff *skb, struct genl_info *info)
params.p2p_ctwindow = -1;
params.p2p_opp_ps = -1;
- if (info->attrs[NL80211_ATTR_BSS_CTS_PROT])
+ if (info->attrs[NL80211_ATTR_BSS_CTS_PROT]) {
params.use_cts_prot =
nla_get_u8(info->attrs[NL80211_ATTR_BSS_CTS_PROT]);
- if (info->attrs[NL80211_ATTR_BSS_SHORT_PREAMBLE])
+ params.changed |= CFG80211_BSS_PARAM_CHANGED_CTS_PROT;
+ }
+
+ if (info->attrs[NL80211_ATTR_BSS_SHORT_PREAMBLE]) {
params.use_short_preamble =
nla_get_u8(info->attrs[NL80211_ATTR_BSS_SHORT_PREAMBLE]);
- if (info->attrs[NL80211_ATTR_BSS_SHORT_SLOT_TIME])
+ params.changed |= CFG80211_BSS_PARAM_CHANGED_SHORT_PREAMBLE;
+ }
+
+ if (info->attrs[NL80211_ATTR_BSS_SHORT_SLOT_TIME]) {
params.use_short_slot_time =
nla_get_u8(info->attrs[NL80211_ATTR_BSS_SHORT_SLOT_TIME]);
+ params.changed |= CFG80211_BSS_PARAM_CHANGED_SHORT_SLOT_TIME;
+ }
+
if (info->attrs[NL80211_ATTR_BSS_BASIC_RATES]) {
params.basic_rates =
nla_data(info->attrs[NL80211_ATTR_BSS_BASIC_RATES]);
params.basic_rates_len =
nla_len(info->attrs[NL80211_ATTR_BSS_BASIC_RATES]);
+ params.changed |= CFG80211_BSS_PARAM_CHANGED_BASIC_RATES;
}
- if (info->attrs[NL80211_ATTR_AP_ISOLATE])
+
+ if (info->attrs[NL80211_ATTR_AP_ISOLATE]) {
params.ap_isolate = !!nla_get_u8(info->attrs[NL80211_ATTR_AP_ISOLATE]);
- if (info->attrs[NL80211_ATTR_BSS_HT_OPMODE])
+ params.changed |= CFG80211_BSS_PARAM_CHANGED_AP_ISOLATE;
+ }
+
+ if (info->attrs[NL80211_ATTR_BSS_HT_OPMODE]) {
params.ht_opmode =
nla_get_u16(info->attrs[NL80211_ATTR_BSS_HT_OPMODE]);
+ params.changed |= CFG80211_BSS_PARAM_CHANGED_HT_OPMODE;
+ }
if (info->attrs[NL80211_ATTR_P2P_CTWINDOW]) {
if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO)
@@ -8272,6 +8288,7 @@ static int nl80211_set_bss(struct sk_buff *skb, struct genl_info *info)
if (params.p2p_ctwindow != 0 &&
!(rdev->wiphy.features & NL80211_FEATURE_P2P_GO_CTWIN))
return -EINVAL;
+ params.changed |= CFG80211_BSS_PARAM_CHANGED_P2P_CTWINDOW;
}
if (info->attrs[NL80211_ATTR_P2P_OPPPS]) {
@@ -8284,6 +8301,7 @@ static int nl80211_set_bss(struct sk_buff *skb, struct genl_info *info)
if (params.p2p_opp_ps &&
!(rdev->wiphy.features & NL80211_FEATURE_P2P_GO_OPPPS))
return -EINVAL;
+ params.changed |= CFG80211_BSS_PARAM_CHANGED_P2P_OPPPS;
}
if (!rdev->ops->change_bss)
With the userspace applications like hostapd, incase if the user explicitly enabled an AP BSS param related config file option, like "ap_isolate", or if the hostapd implicitly sets an AP BSS param like "cts_protection", then those params are sent to the cfg80211 as part of SET_BSS operation request. cfg80211 would then set the bits corresponding to the AP BSS parameters in the newly introduced "changed" bitmap. Drivers which have registered for the .change_bss() cfg80211_ops, on receiving this SET_BSS request, can now understand which specific subset of params are changed by the userspace using this bitmask. If the driver allows explicit configuration of changed AP BSS params and if the values of those params are different from default value in driver/firmware, then the driver can update it accordingly. This helps ensuring that the driver does not partially handle the AP BSS params and avoid misleading the userspace that the SET_BSS operation is fully successful. Signed-off-by: Gokul Sivakumar <gokulkumar.sivakumar@infineon.com> --- include/net/cfg80211.h | 30 ++++++++++++++++++++++++++++++ net/wireless/nl80211.c | 28 +++++++++++++++++++++++----- 2 files changed, 53 insertions(+), 5 deletions(-)