aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2014-09-21 12:00:42 -0400
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-10-29 06:52:26 -0400
commitd92b732e35432d473d18b068597a6220a10e9a96 (patch)
tree182a6c5474c699d253744985c1ebd1ff6f04414d /drivers/net/wireless
parent3b8983b17c78f08e40e1ddc8051bdf839097ba27 (diff)
iwlwifi: mvm: remove mvm argument from get_queues_mask
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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c5
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mac80211.c2
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mvm.h3
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/sta.c2
4 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
index 0c5c0b0e23f5..b8ab4a108720 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
@@ -197,8 +197,7 @@ static void iwl_mvm_mac_tsf_id_iter(void *_data, u8 *mac,
197/* 197/*
198 * Get the mask of the queues used by the vif 198 * Get the mask of the queues used by the vif
199 */ 199 */
200u32 iwl_mvm_mac_get_queues_mask(struct iwl_mvm *mvm, 200u32 iwl_mvm_mac_get_queues_mask(struct ieee80211_vif *vif)
201 struct ieee80211_vif *vif)
202{ 201{
203 u32 qmask = 0, ac; 202 u32 qmask = 0, ac;
204 203
@@ -227,7 +226,7 @@ static void iwl_mvm_mac_iface_iterator(void *_data, u8 *mac,
227 } 226 }
228 227
229 /* Mark the queues used by the vif */ 228 /* Mark the queues used by the vif */
230 data->used_hw_queues |= iwl_mvm_mac_get_queues_mask(data->mvm, vif); 229 data->used_hw_queues |= iwl_mvm_mac_get_queues_mask(vif);
231 230
232 /* Mark MAC IDs as used by clearing the available bit, and 231 /* Mark MAC IDs as used by clearing the available bit, and
233 * (below) mark TSFs as used if their existing use is not 232 * (below) mark TSFs as used if their existing use is not
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 9fc843e6dd2a..c087bf69d290 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -1086,7 +1086,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
1086static void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm, 1086static void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm,
1087 struct ieee80211_vif *vif) 1087 struct ieee80211_vif *vif)
1088{ 1088{
1089 u32 tfd_msk = iwl_mvm_mac_get_queues_mask(mvm, vif); 1089 u32 tfd_msk = iwl_mvm_mac_get_queues_mask(vif);
1090 1090
1091 if (tfd_msk) { 1091 if (tfd_msk) {
1092 mutex_lock(&mvm->mutex); 1092 mutex_lock(&mvm->mutex);
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index aec9f579f5a9..d14dc061d1c2 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -909,8 +909,7 @@ int iwl_mvm_mac_ctxt_add(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
909int iwl_mvm_mac_ctxt_changed(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 909int iwl_mvm_mac_ctxt_changed(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
910 bool force_assoc_off, const u8 *bssid_override); 910 bool force_assoc_off, const u8 *bssid_override);
911int iwl_mvm_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif); 911int iwl_mvm_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
912u32 iwl_mvm_mac_get_queues_mask(struct iwl_mvm *mvm, 912u32 iwl_mvm_mac_get_queues_mask(struct ieee80211_vif *vif);
913 struct ieee80211_vif *vif);
914int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm, 913int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm,
915 struct ieee80211_vif *vif); 914 struct ieee80211_vif *vif);
916int iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm, 915int iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c
index 1731c205c81d..dd0dc5bf8583 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.c
@@ -609,7 +609,7 @@ int iwl_mvm_alloc_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
609 609
610 lockdep_assert_held(&mvm->mutex); 610 lockdep_assert_held(&mvm->mutex);
611 611
612 qmask = iwl_mvm_mac_get_queues_mask(mvm, vif); 612 qmask = iwl_mvm_mac_get_queues_mask(vif);
613 613
614 /* 614 /*
615 * The firmware defines the TFD queue mask to only be relevant 615 * The firmware defines the TFD queue mask to only be relevant