From ca973ab08dc399779cee44ac6efa36d27c864049 Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy Date: Tue, 19 Apr 2011 16:52:58 -0700 Subject: [PATCH] --- yaml --- r: 247287 b: refs/heads/master c: 89e746b244064406c3bfe442bb64c3230f42fa98 h: refs/heads/master i: 247285: 7f9fa49419139f4d1a400827dda09db412c1fdfd 247283: 6b1dc078a9b26d50d3968c924b8bd700a0e83719 247279: 75b3b59bd6ee0a098b3d9c42f009fd521d9ea7a9 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-commands.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0ee1eb2a5459..deb960b171b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3f6e9cff950c312d409e5767365aeb2475b2ab7 +refs/heads/master: 89e746b244064406c3bfe442bb64c3230f42fa98 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c index aba5bc9cf6e0..7f52ab8f5848 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/trunk/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/trunk/drivers/net/wireless/iwlwifi/iwl-commands.h b/trunk/drivers/net/wireless/iwlwifi/iwl-commands.h index e125896c8096..5fdad6532118 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/trunk/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;