nl80211: rename csa counter attributes countdown counters

We want to reuse the attributes for other counters such as BSS color
change. Rename them to more generic names.

Signed-off-by: John Crispin <john@phrozen.org>
Link: https://lore.kernel.org/r/20200811080107.3615705-1-john@phrozen.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 1a4b922f489fceb09971e869524156bb320f4599..ec96d5fe0e057b722d3492d7d9d2f6ffd3f57313 100644 (file)
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2076,10 +2076,10 @@ enum nl80211_commands {
  *     operation).
  * @NL80211_ATTR_CSA_IES: Nested set of attributes containing the IE information
  *     for the time while performing a channel switch.
- * @NL80211_ATTR_CSA_C_OFF_BEACON: An array of offsets (u16) to the channel
- *     switch counters in the beacons tail (%NL80211_ATTR_BEACON_TAIL).
- * @NL80211_ATTR_CSA_C_OFF_PRESP: An array of offsets (u16) to the channel
- *     switch counters in the probe response (%NL80211_ATTR_PROBE_RESP).
+ * @NL80211_ATTR_CNTDWN_OFFS_BEACON: An array of offsets (u16) to the channel
+ *     switch or color change counters in the beacons tail (%NL80211_ATTR_BEACON_TAIL).
+ * @NL80211_ATTR_CNTDWN_OFFS_PRESP: An array of offsets (u16) to the channel
+ *     switch or color change counters in the probe response (%NL80211_ATTR_PROBE_RESP).
  *
  * @NL80211_ATTR_RXMGMT_FLAGS: flags for nl80211_send_mgmt(), u32.
  *     As specified in the &enum nl80211_rxmgmt_flags.
@@ -2815,8 +2815,8 @@ enum nl80211_attrs {
        NL80211_ATTR_CH_SWITCH_COUNT,
        NL80211_ATTR_CH_SWITCH_BLOCK_TX,
        NL80211_ATTR_CSA_IES,
-       NL80211_ATTR_CSA_C_OFF_BEACON,
-       NL80211_ATTR_CSA_C_OFF_PRESP,
+       NL80211_ATTR_CNTDWN_OFFS_BEACON,
+       NL80211_ATTR_CNTDWN_OFFS_PRESP,
 
        NL80211_ATTR_RXMGMT_FLAGS,
 
@@ -3003,6 +3003,8 @@ enum nl80211_attrs {
 #define        NL80211_ATTR_MESH_PARAMS NL80211_ATTR_MESH_CONFIG
 #define NL80211_ATTR_IFACE_SOCKET_OWNER NL80211_ATTR_SOCKET_OWNER
 #define NL80211_ATTR_SAE_DATA NL80211_ATTR_AUTH_DATA
+#define NL80211_ATTR_CSA_C_OFF_BEACON NL80211_ATTR_CNTDWN_OFFS_BEACON
+#define NL80211_ATTR_CSA_C_OFF_PRESP NL80211_ATTR_CNTDWN_OFFS_PRESP
 
 /*
  * Allow user space programs to use #ifdef on new attributes by defining them

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index da0f33c2d2d835ea0ffada25ddbfe79065cc9166..e640e65f3255270147ee570accc85ebecb496723 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -578,8 +578,8 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
        [NL80211_ATTR_CH_SWITCH_COUNT] = { .type = NLA_U32 },
        [NL80211_ATTR_CH_SWITCH_BLOCK_TX] = { .type = NLA_FLAG },
        [NL80211_ATTR_CSA_IES] = { .type = NLA_NESTED },
-       [NL80211_ATTR_CSA_C_OFF_BEACON] = { .type = NLA_BINARY },
-       [NL80211_ATTR_CSA_C_OFF_PRESP] = { .type = NLA_BINARY },
+       [NL80211_ATTR_CNTDWN_OFFS_BEACON] = { .type = NLA_BINARY },
+       [NL80211_ATTR_CNTDWN_OFFS_PRESP] = { .type = NLA_BINARY },
        [NL80211_ATTR_STA_SUPPORTED_CHANNELS] = NLA_POLICY_MIN_LEN(2),
        /*
         * The value of the Length field of the Supported Operating
@@ -8891,10 +8891,10 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
        if (err)
                return err;
 
-       if (!csa_attrs[NL80211_ATTR_CSA_C_OFF_BEACON])
+       if (!csa_attrs[NL80211_ATTR_CNTDWN_OFFS_BEACON])
                return -EINVAL;
 
-       len = nla_len(csa_attrs[NL80211_ATTR_CSA_C_OFF_BEACON]);
+       len = nla_len(csa_attrs[NL80211_ATTR_CNTDWN_OFFS_BEACON]);
        if (!len || (len % sizeof(u16)))
                return -EINVAL;
 
@@ -8905,7 +8905,7 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
                return -EINVAL;
 
        params.counter_offsets_beacon =
-               nla_data(csa_attrs[NL80211_ATTR_CSA_C_OFF_BEACON]);
+               nla_data(csa_attrs[NL80211_ATTR_CNTDWN_OFFS_BEACON]);
 
        /* sanity checks - counters should fit and be the same */
        for (i = 0; i < params.n_counter_offsets_beacon; i++) {
@@ -8918,8 +8918,8 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
                        return -EINVAL;
        }
 
-       if (csa_attrs[NL80211_ATTR_CSA_C_OFF_PRESP]) {
-               len = nla_len(csa_attrs[NL80211_ATTR_CSA_C_OFF_PRESP]);
+       if (csa_attrs[NL80211_ATTR_CNTDWN_OFFS_PRESP]) {
+               len = nla_len(csa_attrs[NL80211_ATTR_CNTDWN_OFFS_PRESP]);
                if (!len || (len % sizeof(u16)))
                        return -EINVAL;
 
@@ -8930,7 +8930,7 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
                        return -EINVAL;
 
                params.counter_offsets_presp =
-                       nla_data(csa_attrs[NL80211_ATTR_CSA_C_OFF_PRESP]);
+                       nla_data(csa_attrs[NL80211_ATTR_CNTDWN_OFFS_PRESP]);
 
                /* sanity checks - counters should fit and be the same */
                for (i = 0; i < params.n_counter_offsets_presp; i++) {