wifi: iwlwifi: mvm: unite sta_modify_disable_tx flows

These flows are the same in both MLD API and the current API,
except for the commands that are being sent during this flows.
Instead of checking each time before calling these floews
what API we use and then call the correct function, call always the old
one, which in turn will call the new one in case we're using the MLD
API.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230328104948.5692d8dea9be.Ib1882b2c2f0b0603abc4b7d4a0ecc45cd1fbf9a7@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index d36319b..ce2f502 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -4762,6 +4762,9 @@ bool __iwl_mvm_unassign_vif_chanctx_common(struct iwl_mvm *mvm,
 
                mvmvif->csa_countdown = false;
 
+               /* Set CS bit on all the stations */
+               iwl_mvm_modify_all_sta_disable_tx(mvm, mvmvif, true);
+
                /* Save blocked iface, the timeout is set on the next beacon */
                rcu_assign_pointer(mvm->csa_tx_blocked_vif, vif);
 
@@ -4787,9 +4790,6 @@ static void __iwl_mvm_unassign_vif_chanctx(struct iwl_mvm *mvm,
        if (vif->type == NL80211_IFTYPE_MONITOR)
                iwl_mvm_rm_snif_sta(mvm, vif);
 
-       if (vif->type == NL80211_IFTYPE_AP)
-               /* Set CS bit on all the stations */
-               iwl_mvm_modify_all_sta_disable_tx(mvm, mvmvif, true);
 
        if (vif->type == NL80211_IFTYPE_STATION && switching_chanctx) {
                disabled_vif = vif;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
index 871da58..92f1742 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
@@ -220,10 +220,6 @@ static void __iwl_mvm_mld_unassign_vif_chanctx(struct iwl_mvm *mvm,
        if (vif->type == NL80211_IFTYPE_MONITOR)
                iwl_mvm_mld_rm_snif_sta(mvm, vif);
 
-       if (vif->type == NL80211_IFTYPE_AP)
-               /* Set CS bit on all the stations */
-               iwl_mvm_mld_modify_all_sta_disable_tx(mvm, mvmvif, true);
-
        /* Link needs to be deactivated before removal */
        iwl_mvm_link_changed(mvm, vif, LINK_CONTEXT_MODIFY_ACTIVE, false);
        iwl_mvm_remove_link(mvm, vif);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
index 643eb58..a6eb188 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
@@ -589,24 +589,14 @@ int iwl_mvm_mld_rm_sta_id(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
        return ret;
 }
 
-static void iwl_mvm_mld_sta_modify_disable_tx(struct iwl_mvm *mvm,
-                                             struct ieee80211_sta *sta,
-                                             bool disable)
+void iwl_mvm_mld_sta_modify_disable_tx(struct iwl_mvm *mvm,
+                                      struct iwl_mvm_sta *mvmsta,
+                                      bool disable)
 {
-       struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);
        struct iwl_mvm_sta_disable_tx_cmd cmd;
        int ret;
 
-       spin_lock_bh(&mvm_sta->lock);
-
-       if (mvm_sta->disable_tx == disable) {
-               spin_unlock_bh(&mvm_sta->lock);
-               return;
-       }
-
-       mvm_sta->disable_tx = disable;
-
-       cmd.sta_id = cpu_to_le32(mvm_sta->deflink.sta_id);
+       cmd.sta_id = cpu_to_le32(mvmsta->deflink.sta_id);
        cmd.disable = cpu_to_le32(disable);
 
        ret = iwl_mvm_send_cmd_pdu(mvm,
@@ -616,6 +606,22 @@ static void iwl_mvm_mld_sta_modify_disable_tx(struct iwl_mvm *mvm,
                IWL_ERR(mvm,
                        "Failed to send STA_DISABLE_TX_CMD command (%d)\n",
                        ret);
+}
+
+void iwl_mvm_mld_sta_modify_disable_tx_ap(struct iwl_mvm *mvm,
+                                         struct ieee80211_sta *sta,
+                                         bool disable)
+{
+       struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);
+
+       spin_lock_bh(&mvm_sta->lock);
+
+       if (mvm_sta->disable_tx == disable) {
+               spin_unlock_bh(&mvm_sta->lock);
+               return;
+       }
+
+       iwl_mvm_mld_sta_modify_disable_tx(mvm, mvm_sta, disable);
 
        spin_unlock_bh(&mvm_sta->lock);
 }
@@ -641,7 +647,7 @@ void iwl_mvm_mld_modify_all_sta_disable_tx(struct iwl_mvm *mvm,
                    FW_CMD_ID_AND_COLOR(mvmvif->id, mvmvif->color))
                        continue;
 
-               iwl_mvm_mld_sta_modify_disable_tx(mvm, sta, disable);
+               iwl_mvm_mld_sta_modify_disable_tx(mvm, mvm_sta, disable);
        }
 
        rcu_read_unlock();

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index 0ff66ff..54ef749 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -4030,7 +4030,8 @@ void iwl_mvm_rx_eosp_notif(struct iwl_mvm *mvm,
 }
 
 void iwl_mvm_sta_modify_disable_tx(struct iwl_mvm *mvm,
-                                  struct iwl_mvm_sta *mvmsta, bool disable)
+                                  struct iwl_mvm_sta *mvmsta,
+                                  bool disable)
 {
        struct iwl_mvm_add_sta_cmd cmd = {
                .add_modify = STA_MODE_MODIFY,
@@ -4041,6 +4042,11 @@ void iwl_mvm_sta_modify_disable_tx(struct iwl_mvm *mvm,
        };
        int ret;
 
+       if (mvm->mld_api_is_used) {
+               iwl_mvm_mld_sta_modify_disable_tx(mvm, mvmsta, disable);
+               return;
+       }
+
        ret = iwl_mvm_send_cmd_pdu(mvm, ADD_STA, CMD_ASYNC,
                                   iwl_mvm_add_sta_cmd_size(mvm), &cmd);
        if (ret)
@@ -4053,6 +4059,11 @@ void iwl_mvm_sta_modify_disable_tx_ap(struct iwl_mvm *mvm,
 {
        struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);
 
+       if (mvm->mld_api_is_used) {
+               iwl_mvm_mld_sta_modify_disable_tx_ap(mvm, sta, disable);
+               return;
+       }
+
        spin_lock_bh(&mvm_sta->lock);
 
        if (mvm_sta->disable_tx == disable) {
@@ -4103,6 +4114,11 @@ void iwl_mvm_modify_all_sta_disable_tx(struct iwl_mvm *mvm,
        struct iwl_mvm_sta *mvm_sta;
        int i;
 
+       if (mvm->mld_api_is_used) {
+               iwl_mvm_mld_modify_all_sta_disable_tx(mvm, mvmvif, disable);
+               return;
+       }
+
        rcu_read_lock();
 
        /* Block/unblock all the stations of the given mvmvif */

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
index 5436e52..3a9002e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h
@@ -640,4 +640,10 @@ int iwl_mvm_mld_rm_sta_id(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 void iwl_mvm_mld_modify_all_sta_disable_tx(struct iwl_mvm *mvm,
                                           struct iwl_mvm_vif *mvmvif,
                                           bool disable);
+void iwl_mvm_mld_sta_modify_disable_tx(struct iwl_mvm *mvm,
+                                      struct iwl_mvm_sta *mvm_sta,
+                                      bool disable);
+void iwl_mvm_mld_sta_modify_disable_tx_ap(struct iwl_mvm *mvm,
+                                         struct ieee80211_sta *sta,
+                                         bool disable);
 #endif /* __sta_h__ */