aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-04-19 19:52:58 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-04-30 11:39:53 -0400
commit89e746b244064406c3bfe442bb64c3230f42fa98 (patch)
treeb005d44eb617cf1493f33468479f82f599096287
parentc3f6e9cff950c312d409e5767365aeb2475b2ab7 (diff)
iwlagn: remove 5000 from rxon_assoc structure
The data structure is shared by all _agn devices, remove the reference to 5000 Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-rxon.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-commands.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index aba5bc9cf6e0..7f52ab8f5848 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -125,7 +125,7 @@ static int iwlagn_send_rxon_assoc(struct iwl_priv *priv,
125 struct iwl_rxon_context *ctx) 125 struct iwl_rxon_context *ctx)
126{ 126{
127 int ret = 0; 127 int ret = 0;
128 struct iwl5000_rxon_assoc_cmd rxon_assoc; 128 struct iwl_rxon_assoc_cmd rxon_assoc;
129 const struct iwl_rxon_cmd *rxon1 = &ctx->staging; 129 const struct iwl_rxon_cmd *rxon1 = &ctx->staging;
130 const struct iwl_rxon_cmd *rxon2 = &ctx->active; 130 const struct iwl_rxon_cmd *rxon2 = &ctx->active;
131 131
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index e125896c8096..5fdad6532118 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -661,7 +661,7 @@ struct iwl_rxon_cmd {
661/* 661/*
662 * REPLY_RXON_ASSOC = 0x11 (command, has simple generic response) 662 * REPLY_RXON_ASSOC = 0x11 (command, has simple generic response)
663 */ 663 */
664struct iwl5000_rxon_assoc_cmd { 664struct iwl_rxon_assoc_cmd {
665 __le32 flags; 665 __le32 flags;
666 __le32 filter_flags; 666 __le32 filter_flags;
667 u8 ofdm_basic_rates; 667 u8 ofdm_basic_rates;