aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 8a378bd1a7ab..e7d166d2255c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -600,7 +600,7 @@ static void iwl3945_pass_packet_to_mac80211(struct iwl_priv *priv,
600 /* Set the size of the skb to the size of the frame */ 600 /* Set the size of the skb to the size of the frame */
601 skb_put(rxb->skb, le16_to_cpu(rx_hdr->len)); 601 skb_put(rxb->skb, le16_to_cpu(rx_hdr->len));
602 602
603 if (iwl3945_mod_params.sw_crypto) 603 if (!iwl3945_mod_params.sw_crypto)
604 iwl3945_set_decrypted_flag(priv, rxb->skb, 604 iwl3945_set_decrypted_flag(priv, rxb->skb,
605 le32_to_cpu(rx_end->status), stats); 605 le32_to_cpu(rx_end->status), stats);
606 606
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index d145002d0a69..6a32f568215a 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -92,6 +92,7 @@ MODULE_LICENSE("GPL");
92 /* module parameters */ 92 /* module parameters */
93struct iwl_mod_params iwl3945_mod_params = { 93struct iwl_mod_params iwl3945_mod_params = {
94 .num_of_queues = IWL39_MAX_NUM_QUEUES, 94 .num_of_queues = IWL39_MAX_NUM_QUEUES,
95 .sw_crypto = 1,
95 /* the rest are 0 by default */ 96 /* the rest are 0 by default */
96}; 97};
97 98
@@ -7814,9 +7815,9 @@ module_param_named(antenna, iwl3945_mod_params.antenna, int, 0444);
7814MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])"); 7815MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])");
7815module_param_named(disable, iwl3945_mod_params.disable, int, 0444); 7816module_param_named(disable, iwl3945_mod_params.disable, int, 0444);
7816MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])"); 7817MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");
7817module_param_named(hwcrypto, iwl3945_mod_params.sw_crypto, int, 0444); 7818module_param_named(swcrypto, iwl3945_mod_params.sw_crypto, int, 0444);
7818MODULE_PARM_DESC(hwcrypto, 7819MODULE_PARM_DESC(swcrypto,
7819 "using hardware crypto engine (default 0 [software])\n"); 7820 "using software crypto (default 1 [software])\n");
7820module_param_named(debug, iwl3945_mod_params.debug, uint, 0444); 7821module_param_named(debug, iwl3945_mod_params.debug, uint, 0444);
7821MODULE_PARM_DESC(debug, "debug output mask"); 7822MODULE_PARM_DESC(debug, "debug output mask");
7822module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan, int, 0444); 7823module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan, int, 0444);