iwlwifi: mvm: simplify TX power setting

There's no need to double this code, just put it into the common
code that's called in all the cases.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210117164916.1f75d426ebe4.I58f6612f7e168c655bdef206a53e5bc117c84cf5@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 4e14a97bd16896b7576a36c7aae2d1aa9574f3f6..04fda82502911e22ec1ecbe470a1c7cd65525f67 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -2401,12 +2401,6 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
                        IWL_ERR(mvm, "failed to update power mode\n");
        }
 
-       if (changes & BSS_CHANGED_TXPOWER) {
-               IWL_DEBUG_CALIB(mvm, "Changing TX Power to %d\n",
-                               bss_conf->txpower);
-               iwl_mvm_set_tx_power(mvm, vif, bss_conf->txpower);
-       }
-
        if (changes & BSS_CHANGED_CQM) {
                IWL_DEBUG_MAC80211(mvm, "cqm info_changed\n");
                /* reset cqm events tracking */
@@ -2638,12 +2632,6 @@ iwl_mvm_bss_info_changed_ap_ibss(struct iwl_mvm *mvm,
            iwl_mvm_mac_ctxt_beacon_changed(mvm, vif))
                IWL_WARN(mvm, "Failed updating beacon data\n");
 
-       if (changes & BSS_CHANGED_TXPOWER) {
-               IWL_DEBUG_CALIB(mvm, "Changing TX Power to %d\n",
-                               bss_conf->txpower);
-               iwl_mvm_set_tx_power(mvm, vif, bss_conf->txpower);
-       }
-
        if (changes & BSS_CHANGED_FTM_RESPONDER) {
                int ret = iwl_mvm_ftm_start_responder(mvm, vif);
 
@@ -2683,6 +2671,12 @@ static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw,
                WARN_ON_ONCE(1);
        }
 
+       if (changes & BSS_CHANGED_TXPOWER) {
+               IWL_DEBUG_CALIB(mvm, "Changing TX Power to %d dBm\n",
+                               bss_conf->txpower);
+               iwl_mvm_set_tx_power(mvm, vif, bss_conf->txpower);
+       }
+
        mutex_unlock(&mvm->mutex);
 }