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

Commit 90e8e424 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: drop sw_crypto from hw_params. 



Each HW supported by iwlwifi is capable of hardware crypto
so drop this flag from hw_params structure.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3354a0f6

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

+1 −1
Original line number Diff line number Diff line
@@ -1987,7 +1987,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv) 
	staging_rxon->reserved4 = 0;

	staging_rxon->reserved5 = 0;



	iwl_set_rxon_hwcrypto(priv, !priv->hw_params.sw_crypto);

	iwl_set_rxon_hwcrypto(priv, !iwl3945_mod_params.sw_crypto);



	/* Apply the new configuration */

	rc = iwl_send_cmd_pdu(priv, REPLY_RXON,

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

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

		       priv->staging_rxon.bssid_addr);



	iwl_set_rxon_hwcrypto(priv, !priv->hw_params.sw_crypto);

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



	/* Apply the new configuration

	 * RXON unassoc clears the station table in uCode, send it before
@@ -2337,7 +2337,7 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 


	IWL_DEBUG_MAC80211(priv, "enter\n");



	if (priv->hw_params.sw_crypto) {

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

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

		return -EOPNOTSUPP;

	}

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

+0 −1
Original line number Diff line number Diff line
@@ -1361,7 +1361,6 @@ EXPORT_SYMBOL(iwl_setup_mac); 


int iwl_set_hw_params(struct iwl_priv *priv)

{

	priv->hw_params.sw_crypto = priv->cfg->mod_params->sw_crypto;

	priv->hw_params.max_rxq_size = RX_QUEUE_SIZE;

	priv->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;

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

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

+0 −1
Original line number Diff line number Diff line
@@ -608,7 +608,6 @@ struct iwl_hw_params { 
	u8  max_stations;

	u8  bcast_sta_id;

	u8 fat_channel;

	u8 sw_crypto;

	u32 max_inst_size;

	u32 max_data_size;

	u32 max_bsm_size;

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

+1 −1
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ static void iwl_pass_packet_to_mac80211(struct iwl_priv *priv, 
	hdr = (struct ieee80211_hdr *)rxb->skb->data;



	/*  in case of HW accelerated crypto and bad decryption, drop */

	if (!priv->hw_params.sw_crypto &&

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

	    iwl_set_decrypted_flag(priv, hdr, ampdu_status, stats))

		return;