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>

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index aba5bc9cf6e061a6a14cbf76ac5b844195ab6162..7f52ab8f5848247dc752463502b68e4d5e2ddbd8 100644 (file)
--- 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,
                           struct iwl_rxon_context *ctx)
 {
        int ret = 0;
-       struct iwl5000_rxon_assoc_cmd rxon_assoc;
+       struct iwl_rxon_assoc_cmd rxon_assoc;
        const struct iwl_rxon_cmd *rxon1 = &ctx->staging;
        const struct iwl_rxon_cmd *rxon2 = &ctx->active;
 

diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index e125896c80963b6923f28f1b4012e7e47e3c9402..5fdad6532118884aebdbf9854597cbf2e0928ad6 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -661,7 +661,7 @@ struct iwl_rxon_cmd {
 /*
  * REPLY_RXON_ASSOC = 0x11 (command, has simple generic response)
  */
-struct iwl5000_rxon_assoc_cmd {
+struct iwl_rxon_assoc_cmd {
        __le32 flags;
        __le32 filter_flags;
        u8 ofdm_basic_rates;