Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcc76c6b authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlwifi: Use HW acceleration decryption by default 



This patch reverses the hw_crypto logic and makes HW crypto a default.
Giving swcrypto=1 as parameter to the module disables HW crypto.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 59003835

drivers/net/wireless/iwlwifi/iwl-4965.c

+3 −4
Original line number Diff line number Diff line
@@ -3691,7 +3691,7 @@ static void iwl4965_handle_data_packet(struct iwl_priv *priv, int is_data, 
	stats->flag = 0;

	hdr = (struct ieee80211_hdr *)rxb->skb->data;



	if (priv->cfg->mod_params->hw_crypto)

	if (!priv->cfg->mod_params->sw_crypto)

		iwl4965_set_decrypted_flag(priv, rxb->skb, ampdu_status, stats);



	if (priv->add_radiotap)
@@ -4988,9 +4988,8 @@ module_param_named(antenna, iwl4965_mod_params.antenna, int, 0444); 
MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])");

module_param_named(disable, iwl4965_mod_params.disable, int, 0444);

MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");

module_param_named(hwcrypto, iwl4965_mod_params.hw_crypto, int, 0444);

MODULE_PARM_DESC(hwcrypto,

		 "using hardware crypto engine (default 0 [software])\n");

module_param_named(swcrypto, iwl4965_mod_params.sw_crypto, int, 0444);

MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])\n");

module_param_named(debug, iwl4965_mod_params.debug, int, 0444);

MODULE_PARM_DESC(debug, "debug output mask");

module_param_named(

drivers/net/wireless/iwlwifi/iwl-core.h

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ struct iwl_ops { 


struct iwl_mod_params {

	int disable;		/* def: 0 = enable radio */

	int hw_crypto;		/* def: 0 = using software encryption */

	int sw_crypto;		/* def: 0 = using hardware encryption */

	int debug;		/* def: 0 = minimal debug log messages */

	int disable_hw_scan;	/* def: 0 = use h/w scan */

	int num_of_queues;	/* def: HW dependent */

drivers/net/wireless/iwlwifi/iwl4965-base.c

+2 −2
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv) 
		       le16_to_cpu(priv->staging_rxon.channel),

		       print_mac(mac, priv->staging_rxon.bssid_addr));



	iwl4965_set_rxon_hwcrypto(priv, priv->cfg->mod_params->hw_crypto);

	iwl4965_set_rxon_hwcrypto(priv, !priv->cfg->mod_params->sw_crypto);

	/* Apply the new configuration */

	rc = iwl_send_cmd_pdu(priv, REPLY_RXON,

			      sizeof(struct iwl4965_rxon_cmd), &priv->staging_rxon);
@@ -6840,7 +6840,7 @@ static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 


	IWL_DEBUG_MAC80211("enter\n");



	if (!priv->cfg->mod_params->hw_crypto) {

	if (priv->cfg->mod_params->sw_crypto) {

		IWL_DEBUG_MAC80211("leave - hwcrypto disabled\n");

		return -EOPNOTSUPP;

	}