iwlwifi: mvm: Disable power save for monitor interface

When monitor interface is activated device power save needs
to be disabled.
Re-consider power management status on other active
interfaces when monitor interface is bound or unbound.

Signed-off-by: Alexander Bondar <alexander.bondar@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index e1c379a61d83..d36105fa4bf6 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -1610,7 +1610,13 @@ static int iwl_mvm_assign_vif_chanctx(struct ieee80211_hw *hw,
                 goto out_unlock;
 
         /*
-         * Setting the quota at this stage is only required for monitor
+         * Power state must be updated before quotas,
+         * otherwise fw will complain.
+         */
+        mvm->bound_vif_cnt++;
+        iwl_mvm_power_update_binding(mvm, vif, true);
+
+        /* Setting the quota at this stage is only required for monitor
          * interfaces. For the other types, the bss_info changed flow
          * will handle quota settings.
          */
@@ -1621,13 +1627,12 @@ static int iwl_mvm_assign_vif_chanctx(struct ieee80211_hw *hw,
                         goto out_remove_binding;
         }
 
-        mvm->bound_vif_cnt++;
-        iwl_mvm_power_update_binding(mvm, vif);
-
         goto out_unlock;
 
  out_remove_binding:
         iwl_mvm_binding_remove_vif(mvm, vif);
+        mvm->bound_vif_cnt--;
+        iwl_mvm_power_update_binding(mvm, vif, false);
  out_unlock:
         mutex_unlock(&mvm->mutex);
         if (ret)
@@ -1662,7 +1667,7 @@ static void iwl_mvm_unassign_vif_chanctx(struct ieee80211_hw *hw,
 out_unlock:
         mvmvif->phy_ctxt = NULL;
         mvm->bound_vif_cnt--;
-        iwl_mvm_power_update_binding(mvm, vif);
+        iwl_mvm_power_update_binding(mvm, vif, false);
 
         mutex_unlock(&mvm->mutex);
 }