diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2009-05-15 19:13:43 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-05-20 14:46:26 -0400 |
commit | bed420d9c0a642cda3d37b66db0f66f87d8f8185 (patch) | |
tree | e814fa21d89f09a4eae986c47530f71b6e6f954b /drivers/net/wireless/iwlwifi | |
parent | 44710bbc073b2e7ea269cf716b817297cd35ae10 (diff) |
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: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 7 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 3049ba25c3fc..427489a1f07a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -503,18 +503,13 @@ struct iwl3945_tid_data { | |||
503 | u16 seq_number; | 503 | u16 seq_number; |
504 | }; | 504 | }; |
505 | 505 | ||
506 | struct iwl3945_hw_key { | ||
507 | enum ieee80211_key_alg alg; | ||
508 | int keylen; | ||
509 | u8 key[32]; | ||
510 | }; | ||
511 | 506 | ||
512 | struct iwl3945_station_entry { | 507 | struct iwl3945_station_entry { |
513 | struct iwl3945_addsta_cmd sta; | 508 | struct iwl3945_addsta_cmd sta; |
514 | struct iwl3945_tid_data tid[MAX_TID_COUNT]; | 509 | struct iwl3945_tid_data tid[MAX_TID_COUNT]; |
515 | u8 used; | 510 | u8 used; |
516 | u8 ps_status; | 511 | u8 ps_status; |
517 | struct iwl3945_hw_key keyinfo; | 512 | struct iwl_hw_key keyinfo; |
518 | }; | 513 | }; |
519 | 514 | ||
520 | struct iwl_station_entry { | 515 | struct iwl_station_entry { |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index c32ec809053f..5d52f2275b6d 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -340,7 +340,7 @@ static int iwl3945_clear_sta_key_info(struct iwl_priv *priv, u8 sta_id) | |||
340 | unsigned long flags; | 340 | unsigned long flags; |
341 | 341 | ||
342 | spin_lock_irqsave(&priv->sta_lock, flags); | 342 | spin_lock_irqsave(&priv->sta_lock, flags); |
343 | memset(&priv->stations_39[sta_id].keyinfo, 0, sizeof(struct iwl3945_hw_key)); | 343 | memset(&priv->stations_39[sta_id].keyinfo, 0, sizeof(struct iwl_hw_key)); |
344 | memset(&priv->stations_39[sta_id].sta.key, 0, | 344 | memset(&priv->stations_39[sta_id].sta.key, 0, |
345 | sizeof(struct iwl4965_keyinfo)); | 345 | sizeof(struct iwl4965_keyinfo)); |
346 | priv->stations_39[sta_id].sta.key.key_flags = STA_KEY_FLG_NO_ENC; | 346 | 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, | |||
578 | int sta_id) | 578 | int sta_id) |
579 | { | 579 | { |
580 | struct iwl3945_tx_cmd *tx = (struct iwl3945_tx_cmd *)cmd->cmd.payload; | 580 | struct iwl3945_tx_cmd *tx = (struct iwl3945_tx_cmd *)cmd->cmd.payload; |
581 | struct iwl3945_hw_key *keyinfo = | 581 | struct iwl_hw_key *keyinfo = &priv->stations_39[sta_id].keyinfo; |
582 | &priv->stations_39[sta_id].keyinfo; | ||
583 | 582 | ||
584 | switch (keyinfo->alg) { | 583 | switch (keyinfo->alg) { |
585 | case ALG_CCMP: | 584 | case ALG_CCMP: |