aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rxon.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-rxon.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 88a7f3a1056c..5c7bddd5cfef 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -177,8 +177,7 @@ static int iwlagn_disconn_pan(struct iwl_priv *priv,
177 return ret; 177 return ret;
178} 178}
179 179
180static void iwlagn_update_qos(struct iwl_priv *priv, 180void iwlagn_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
181 struct iwl_rxon_context *ctx)
182{ 181{
183 int ret; 182 int ret;
184 183
@@ -205,8 +204,8 @@ static void iwlagn_update_qos(struct iwl_priv *priv,
205 IWL_DEBUG_QUIET_RFKILL(priv, "Failed to update QoS\n"); 204 IWL_DEBUG_QUIET_RFKILL(priv, "Failed to update QoS\n");
206} 205}
207 206
208static int iwlagn_update_beacon(struct iwl_priv *priv, 207int iwlagn_update_beacon(struct iwl_priv *priv,
209 struct ieee80211_vif *vif) 208 struct ieee80211_vif *vif)
210{ 209{
211 lockdep_assert_held(&priv->mutex); 210 lockdep_assert_held(&priv->mutex);
212 211
@@ -879,8 +878,8 @@ static int iwl_check_rxon_cmd(struct iwl_priv *priv,
879 * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that 878 * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that
880 * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required. 879 * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.
881 */ 880 */
882static int iwl_full_rxon_required(struct iwl_priv *priv, 881int iwl_full_rxon_required(struct iwl_priv *priv,
883 struct iwl_rxon_context *ctx) 882 struct iwl_rxon_context *ctx)
884{ 883{
885 const struct iwl_rxon_cmd *staging = &ctx->staging; 884 const struct iwl_rxon_cmd *staging = &ctx->staging;
886 const struct iwl_rxon_cmd *active = &ctx->active; 885 const struct iwl_rxon_cmd *active = &ctx->active;
@@ -1223,9 +1222,9 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
1223 return ret; 1222 return ret;
1224} 1223}
1225 1224
1226static void iwlagn_check_needed_chains(struct iwl_priv *priv, 1225void iwlagn_check_needed_chains(struct iwl_priv *priv,
1227 struct iwl_rxon_context *ctx, 1226 struct iwl_rxon_context *ctx,
1228 struct ieee80211_bss_conf *bss_conf) 1227 struct ieee80211_bss_conf *bss_conf)
1229{ 1228{
1230 struct ieee80211_vif *vif = ctx->vif; 1229 struct ieee80211_vif *vif = ctx->vif;
1231 struct iwl_rxon_context *tmp; 1230 struct iwl_rxon_context *tmp;
@@ -1317,7 +1316,7 @@ static void iwlagn_check_needed_chains(struct iwl_priv *priv,
1317 ht_conf->single_chain_sufficient = !need_multiple; 1316 ht_conf->single_chain_sufficient = !need_multiple;
1318} 1317}
1319 1318
1320static void iwlagn_chain_noise_reset(struct iwl_priv *priv) 1319void iwlagn_chain_noise_reset(struct iwl_priv *priv)
1321{ 1320{
1322 struct iwl_chain_noise_data *data = &priv->chain_noise_data; 1321 struct iwl_chain_noise_data *data = &priv->chain_noise_data;
1323 int ret; 1322 int ret;