Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ar9170/phy.c
	drivers/net/wireless/zd1211rw/zd_rf_rf2959.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
index 35f085ac336..079275f2c64 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2010 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -474,7 +474,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
         memset(&priv->stations[sta_id].keyinfo, 0,
                                         sizeof(struct iwl_hw_key));
         memset(&priv->stations[sta_id].sta.key, 0,
-                                        sizeof(struct iwl4965_keyinfo));
+                                        sizeof(struct iwl_keyinfo));
         priv->stations[sta_id].sta.key.key_flags =
                         STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID;
         priv->stations[sta_id].sta.key.key_offset = WEP_INVALID_OFFSET;