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

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

iwlwifi: drop struct iwl3945_hw_key 



This patch replaces struct iwl3945_hw_key by struct iwl_hw_key.
It's not used directly with any host command therefore removal is trivial

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 44710bbc

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

+1 −6
Original line number Diff line number Diff line
@@ -503,18 +503,13 @@ struct iwl3945_tid_data { 
	u16 seq_number;

};



struct iwl3945_hw_key {

	enum ieee80211_key_alg alg;

	int keylen;

	u8 key[32];

};



struct iwl3945_station_entry {

	struct iwl3945_addsta_cmd sta;

	struct iwl3945_tid_data tid[MAX_TID_COUNT];

	u8 used;

	u8 ps_status;

	struct iwl3945_hw_key keyinfo;

	struct iwl_hw_key keyinfo;

};



struct iwl_station_entry {

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

+2 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static int iwl3945_clear_sta_key_info(struct iwl_priv *priv, u8 sta_id) 
	unsigned long flags;



	spin_lock_irqsave(&priv->sta_lock, flags);

	memset(&priv->stations_39[sta_id].keyinfo, 0, sizeof(struct iwl3945_hw_key));

	memset(&priv->stations_39[sta_id].keyinfo, 0, sizeof(struct iwl_hw_key));

	memset(&priv->stations_39[sta_id].sta.key, 0,

		sizeof(struct iwl4965_keyinfo));

	priv->stations_39[sta_id].sta.key.key_flags = STA_KEY_FLG_NO_ENC;
@@ -578,8 +578,7 @@ static void iwl3945_build_tx_cmd_hwcrypto(struct iwl_priv *priv, 
				      int sta_id)

{

	struct iwl3945_tx_cmd *tx = (struct iwl3945_tx_cmd *)cmd->cmd.payload;

	struct iwl3945_hw_key *keyinfo =

	    &priv->stations_39[sta_id].keyinfo;

	struct iwl_hw_key *keyinfo = &priv->stations_39[sta_id].keyinfo;



	switch (keyinfo->alg) {

	case ALG_CCMP: