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

Commit 8236e183 authored by Max Stepanov's avatar Max Stepanov Committed by John W. Linville
Browse files

iwlwifi: Bug fix, CCMP with HW encryption with AGG 



This patch fixes a bug in security. Enables CCMP HW encryption with
aggregations.

Signed-off-by: default avatarMax Stepanov <max.stepanov@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 56ca84c6

drivers/net/wireless/iwlwifi/iwl-4965-commands.h

+4 −0
Original line number Diff line number Diff line
@@ -1045,6 +1045,10 @@ struct iwl4965_rx_mpdu_res_start { 
 * MAC header) to DWORD boundary. */

#define TX_CMD_FLG_MH_PAD_MSK __constant_cpu_to_le32(1 << 20)



/* accelerate aggregation support

 * 0 - no CCMP encryption; 1 - CCMP encryption */

#define TX_CMD_FLG_AGG_CCMP_MSK __constant_cpu_to_le32(1 << 22)



/* HCCA-AP - disable duration overwriting. */

#define TX_CMD_FLG_DUR_MSK __constant_cpu_to_le32(1 << 25)

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

+2 −0
Original line number Diff line number Diff line
@@ -2427,6 +2427,8 @@ static void iwl4965_build_tx_cmd_hwcrypto(struct iwl4965_priv *priv, 
	case ALG_CCMP:

		cmd->cmd.tx.sec_ctl = TX_CMD_SEC_CCM;

		memcpy(cmd->cmd.tx.key, keyinfo->key, keyinfo->keylen);

		if (ctl->flags & IEEE80211_TXCTL_AMPDU)

			cmd->cmd.tx.tx_flags |= TX_CMD_FLG_AGG_CCMP_MSK;

		IWL_DEBUG_TX("tx_cmd with aes hwcrypto\n");

		break;