iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iwlwifi: mvm: remove mvm argument from get_queues_mask

Browse Source 
It is unused and won't be available in some future invocations of the
function.

Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Arik Nemtsov
2014-09-21 19:00:42 +03:00
committed by Emmanuel Grumbach
parent 3b8983b17c
commit d92b732e35
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
View File

@ -197,8 +197,7 @@ static void iwl_mvm_mac_tsf_id_iter(void *_data, u8 *mac,
/* /*
* Get the mask of the queues used by the vif * Get the mask of the queues used by the vif
*/ */
u32 iwl_mvm_mac_get_queues_mask(struct iwl_mvm *mvm, u32 iwl_mvm_mac_get_queues_mask(struct ieee80211_vif *vif)
struct ieee80211_vif *vif)
{ {
u32 qmask = 0, ac; u32 qmask = 0, ac;
@ -227,7 +226,7 @@ static void iwl_mvm_mac_iface_iterator(void *_data, u8 *mac,
} }
/* Mark the queues used by the vif */ /* Mark the queues used by the vif */
data->used_hw_queues |= iwl_mvm_mac_get_queues_mask(data->mvm, vif); data->used_hw_queues |= iwl_mvm_mac_get_queues_mask(vif);
/* Mark MAC IDs as used by clearing the available bit, and /* Mark MAC IDs as used by clearing the available bit, and
* (below) mark TSFs as used if their existing use is not * (below) mark TSFs as used if their existing use is not

2
drivers/net/wireless/iwlwifi/mvm/mac80211.c
View File

@ -1086,7 +1086,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
static void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm, static void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm,
struct ieee80211_vif *vif) struct ieee80211_vif *vif)
{ {
u32 tfd_msk = iwl_mvm_mac_get_queues_mask(mvm, vif); u32 tfd_msk = iwl_mvm_mac_get_queues_mask(vif);
if (tfd_msk) { if (tfd_msk) {
mutex_lock(&mvm->mutex); mutex_lock(&mvm->mutex);

3
drivers/net/wireless/iwlwifi/mvm/mvm.h
View File

@ -909,8 +909,7 @@ int iwl_mvm_mac_ctxt_add(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
int iwl_mvm_mac_ctxt_changed(struct iwl_mvm *mvm, struct ieee80211_vif *vif, int iwl_mvm_mac_ctxt_changed(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
bool force_assoc_off, const u8 *bssid_override); bool force_assoc_off, const u8 *bssid_override);
int iwl_mvm_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif); int iwl_mvm_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
u32 iwl_mvm_mac_get_queues_mask(struct iwl_mvm *mvm, u32 iwl_mvm_mac_get_queues_mask(struct ieee80211_vif *vif);
struct ieee80211_vif *vif);
int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm, int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm,
struct ieee80211_vif *vif); struct ieee80211_vif *vif);
int iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm, int iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,

2
drivers/net/wireless/iwlwifi/mvm/sta.c
View File

@ -609,7 +609,7 @@ int iwl_mvm_alloc_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
lockdep_assert_held(&mvm->mutex); lockdep_assert_held(&mvm->mutex);
qmask = iwl_mvm_mac_get_queues_mask(mvm, vif); qmask = iwl_mvm_mac_get_queues_mask(vif);
/* /*
* The firmware defines the TFD queue mask to only be relevant * The firmware defines the TFD queue mask to only be relevant