aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-rx.c
diff options
context:
space:
mode:
authorDon Fry <donald.h.fry@intel.com>2011-04-20 18:23:57 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-04-30 11:56:45 -0400
commit9d143e9a0d68025efe902d86eb6207cbec36dcdb (patch)
tree7aced3651272a266c3572d2a1c057499404347e2 /drivers/net/wireless/iwlwifi/iwl-rx.c
parentb4ed221daba1b129c3efff8a7352d9791d034330 (diff)
iwlagn: mod param cleanup
All agn devices use the same module parameter structure. Delete the indirection and access the structure diretly. Signed-off-by: Don Fry <donald.h.fry@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-rx.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-rx.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
index aca9a1d40080..0053e9ea9021 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
@@ -433,7 +433,6 @@ static void iwl_recover_from_statistics(struct iwl_priv *priv,
433 struct statistics_tx *tx, 433 struct statistics_tx *tx,
434 unsigned long stamp) 434 unsigned long stamp)
435{ 435{
436 const struct iwl_mod_params *mod_params = priv->cfg->mod_params;
437 unsigned int msecs; 436 unsigned int msecs;
438 437
439 if (test_bit(STATUS_EXIT_PENDING, &priv->status)) 438 if (test_bit(STATUS_EXIT_PENDING, &priv->status))
@@ -449,13 +448,13 @@ static void iwl_recover_from_statistics(struct iwl_priv *priv,
449 if (msecs < 99) 448 if (msecs < 99)
450 return; 449 return;
451 450
452 if (mod_params->ack_check && !iwl_good_ack_health(priv, tx)) { 451 if (iwlagn_mod_params.ack_check && !iwl_good_ack_health(priv, tx)) {
453 IWL_ERR(priv, "low ack count detected, restart firmware\n"); 452 IWL_ERR(priv, "low ack count detected, restart firmware\n");
454 if (!iwl_force_reset(priv, IWL_FW_RESET, false)) 453 if (!iwl_force_reset(priv, IWL_FW_RESET, false))
455 return; 454 return;
456 } 455 }
457 456
458 if (mod_params->plcp_check && 457 if (iwlagn_mod_params.plcp_check &&
459 !iwl_good_plcp_health(priv, cur_ofdm, cur_ofdm_ht, msecs)) 458 !iwl_good_plcp_health(priv, cur_ofdm, cur_ofdm_ht, msecs))
460 iwl_force_reset(priv, IWL_RF_RESET, false); 459 iwl_force_reset(priv, IWL_RF_RESET, false);
461} 460}
@@ -846,7 +845,7 @@ static void iwl_pass_packet_to_mac80211(struct iwl_priv *priv,
846 } 845 }
847 846
848 /* In case of HW accelerated crypto and bad decryption, drop */ 847 /* In case of HW accelerated crypto and bad decryption, drop */
849 if (!priv->cfg->mod_params->sw_crypto && 848 if (!iwlagn_mod_params.sw_crypto &&
850 iwl_set_decrypted_flag(priv, hdr, ampdu_status, stats)) 849 iwl_set_decrypted_flag(priv, hdr, ampdu_status, stats))
851 return; 850 return;
852 851