diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-06-06 15:18:45 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-07 21:41:16 +0300 |
| commit | 0166230c6c696d501a2d2616a30e295b71e39d43 (patch) | |
| tree | 8dd934ae08ef1e387a63465baf024be27ee081a0 /drivers/net/wireless/iwlwifi/mvm/mvm.h | |
| parent | 494983e0e7ae24de7ad3eaa2edc1e31a6a0d7502 (diff) | |
iwlwifi: mvm: remove update type argument from quota update
It turns out that adding the update type argument was pointless as
quota update is never called from the add_interface() callback.
Therefore, IWL_MVM_QUOTA_UPDATE_TYPE_NEW isn't actually needed and
then only a "disabled_vif" argument is needed for the upcoming CSA
work.
Remove the whole enum iwl_mvm_quota_update_type and pass the right
arguments (always NULL for disabled vif right now) to the function
in all current call sites.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mvm.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mvm.h | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h index 55e42f4d6cce..5fedd5521432 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h @@ -844,29 +844,8 @@ int iwl_mvm_binding_add_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif); int iwl_mvm_binding_remove_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif); /* Quota management */ - -/** - * enum iwl_mvm_quota_update_type - quota update type - - * @IWL_MVM_QUOTA_UPDATE_TYPE_REGULAR: regular quota update, use the - * existing vifs (ie. no new vif nor a disabled vif is passed). - * @IWL_MVM_QUOTA_UPDATE_TYPE_NEW: a new vif is being added to the - * quota calculation and needs to be treated differently. - * @IWL_MVM_QUOTA_UPDATE_TYPE_DISABLED: temporarily disable a vif from - * the quota calculation. The mvm mutex must remain held for the - * entire time during which the vif is to remain disabled, - * otherwise there is no guarantee that another code flow will - * not reenable it accidentally (by updating the quotas without - * marking the vif as disabled). - */ -enum iwl_mvm_quota_update_type { - IWL_MVM_QUOTA_UPDATE_TYPE_REGULAR, - IWL_MVM_QUOTA_UPDATE_TYPE_NEW, - IWL_MVM_QUOTA_UPDATE_TYPE_DISABLED, -}; - -int iwl_mvm_update_quotas(struct iwl_mvm *mvm, struct ieee80211_vif *vif, - enum iwl_mvm_quota_update_type type); +int iwl_mvm_update_quotas(struct iwl_mvm *mvm, + struct ieee80211_vif *disabled_vif); /* Scanning */ int iwl_mvm_scan_request(struct iwl_mvm *mvm, |