iwlwifi: mvm: align CSA GO NOA time event naming with the firmware

The time event used for CSA GO will also be used by CSA client.
Rename the symbols to something more generic and aligned with the
firmware code.

Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
index fbcc036b1e44015d1b1086a0e1bf2bfde698f8ca..a2c662808a88df8d7e3bc6f7decf9fc4e88b087f 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
@@ -554,7 +554,7 @@ enum iwl_time_event_type {
        TE_WIDI_TX_SYNC,
 
        /* Channel Switch NoA */
-       TE_P2P_GO_CSA_NOA,
+       TE_CHANNEL_SWITCH_PERIOD,
 
        TE_MAX
 }; /* MAC_EVENT_TYPE_API_E_VER_1 */

diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
index 158aed5014734501ea2678ef2379064715f5bc27..83426714592925ab79307063a53d1379d41d7d4b 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
@@ -1234,13 +1234,13 @@ static void iwl_mvm_csa_count_down(struct iwl_mvm *mvm,
                    !iwl_mvm_te_scheduled(&mvmvif->time_event_data) && gp2) {
                        u32 rel_time = (c + 1) *
                                       csa_vif->bss_conf.beacon_int -
-                                      IWL_MVM_CHANNEL_SWITCH_TIME;
+                                      IWL_MVM_CHANNEL_SWITCH_TIME_GO;
                        u32 apply_time = gp2 + rel_time * 1024;
 
-                       iwl_mvm_schedule_csa_noa(mvm, csa_vif,
-                                                IWL_MVM_CHANNEL_SWITCH_TIME -
-                                                IWL_MVM_CHANNEL_SWITCH_MARGIN,
-                                                apply_time);
+                       iwl_mvm_schedule_csa_period(mvm, csa_vif,
+                                        IWL_MVM_CHANNEL_SWITCH_TIME_GO -
+                                        IWL_MVM_CHANNEL_SWITCH_MARGIN,
+                                        apply_time);
                }
        } else if (!iwl_mvm_te_scheduled(&mvmvif->time_event_data)) {
                /* we don't have CSA NoA scheduled yet, switch now */

diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index efdafa170fd8f4c1cbe94cb8d3c902e23e9f185e..552995810f9eed4faa8c5a143b3beb1c7fee686f 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -87,11 +87,11 @@
 /* A TimeUnit is 1024 microsecond */
 #define MSEC_TO_TU(_msec)      (_msec*1000/1024)
 
-/*
- * The CSA NoA is scheduled IWL_MVM_CHANNEL_SWITCH_TIME TUs before "beacon 0"
- * TBTT. This value should be big enough to ensure that we switch in time.
+/* This value represents the number of TUs before CSA "beacon 0" TBTT
+ * when the CSA time-event needs to be scheduled to start.  It must be
+ * big enough to ensure that we switch in time.
  */
-#define IWL_MVM_CHANNEL_SWITCH_TIME 40
+#define IWL_MVM_CHANNEL_SWITCH_TIME_GO         40
 
 /*
  * This value (in TUs) is used to fine tune the CSA NoA end time which should

diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.c b/drivers/net/wireless/iwlwifi/mvm/time-event.c
index 447d3b1003df2a2c890a0307797393d892d3b95e..b7f9e61d14e276f5505060a0e1cc78e3f2d1af4c 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c
@@ -700,9 +700,9 @@ void iwl_mvm_stop_p2p_roc(struct iwl_mvm *mvm)
        iwl_mvm_roc_finished(mvm);
 }
 
-int iwl_mvm_schedule_csa_noa(struct iwl_mvm *mvm,
-                             struct ieee80211_vif *vif,
-                             u32 duration, u32 apply_time)
+int iwl_mvm_schedule_csa_period(struct iwl_mvm *mvm,
+                               struct ieee80211_vif *vif,
+                               u32 duration, u32 apply_time)
 {
        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
        struct iwl_mvm_time_event_data *te_data = &mvmvif->time_event_data;
@@ -711,14 +711,14 @@ int iwl_mvm_schedule_csa_noa(struct iwl_mvm *mvm,
        lockdep_assert_held(&mvm->mutex);
 
        if (te_data->running) {
-               IWL_DEBUG_TE(mvm, "CS NOA is already scheduled\n");
+               IWL_DEBUG_TE(mvm, "CS period is already scheduled\n");
                return -EBUSY;
        }
 
        time_cmd.action = cpu_to_le32(FW_CTXT_ACTION_ADD);
        time_cmd.id_and_color =
                cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif->id, mvmvif->color));
-       time_cmd.id = cpu_to_le32(TE_P2P_GO_CSA_NOA);
+       time_cmd.id = cpu_to_le32(TE_CHANNEL_SWITCH_PERIOD);
        time_cmd.apply_time = cpu_to_le32(apply_time);
        time_cmd.max_frags = TE_V2_FRAG_NONE;
        time_cmd.duration = cpu_to_le32(duration);

diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.h b/drivers/net/wireless/iwlwifi/mvm/time-event.h
index bee3b2446b35dd29b08e7066b08c0a8f08135672..b350e47e19dab0606737a8950d7f2604e1f90016 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.h
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.h
@@ -219,7 +219,7 @@ void iwl_mvm_te_clear_data(struct iwl_mvm *mvm,
 void iwl_mvm_roc_done_wk(struct work_struct *wk);
 
 /**
- * iwl_mvm_schedule_csa_noa - request NoA for channel switch
+ * iwl_mvm_schedule_csa_period - request channel switch absence period
  * @mvm: the mvm component
  * @vif: the virtual interface for which the channel switch is issued
  * @duration: the duration of the NoA in TU.
@@ -228,9 +228,9 @@ void iwl_mvm_roc_done_wk(struct work_struct *wk);
  * This function is used to schedule NoA time event and is used to perform
  * the channel switch flow.
  */
-int iwl_mvm_schedule_csa_noa(struct iwl_mvm *mvm,
-                            struct ieee80211_vif *vif,
-                            u32 duration, u32 apply_time);
+int iwl_mvm_schedule_csa_period(struct iwl_mvm *mvm,
+                               struct ieee80211_vif *vif,
+                               u32 duration, u32 apply_time);
 
 /**
  * iwl_mvm_te_scheduled - check if the fw received the TE cmd