From 5f970410c8ccddd849916f97e65a5a873a83d4fd Mon Sep 17 00:00:00 2001
From: Ivo van Doorn <ivdoorn@gmail.com>
Date: Mon, 17 Aug 2009 18:53:57 +0200
Subject: [PATCH] --- yaml --- r: 159743 b: refs/heads/master c:
 1738c9e42a9bb3705a3b03dde854f3db269e7bdd h: refs/heads/master i:   159741:
 c769061ecef4d402790a68a2a144320c9ae39264   159739:
 21cdf1935d8e0304ef30230871c2a021d3219de7   159735:
 3866066062abd47b70b3a545483fdc49fc953ba3   159727:
 b4964572c3062bba2eab0ce7668bd27f9864e9b5   159711:
 88830c63ba373422f41c25a3cc131eaadab5e6b3   159679:
 2258e45ce3471e529486f86a038a4dffdb03680d   159615:
 cb89fc3e6918c05eb80ee6e0cfe8de75eb744573   159487:
 c12fc2935185e5d85bcea77a2d32409d86a2f361   159231:
 040bb7e9e5a92a4884f52dc258ad097bfa8c6898   158719:
 1301b2df38f94690a4123a7fa388df051aa8d193   157695:
 667ba87764631997cf36a041fdaa5a1e01f629ff   155647:
 c683d114eece7293db1b0163ade0c4c92c09f93d v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2800usb.c | 8 ++++----
 trunk/drivers/net/wireless/rt2x00/rt2800usb.h | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f295521811f7..8c8518a37ee6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73077c85458739169cdaf893a375b8bb3939d35a
+refs/heads/master: 1738c9e42a9bb3705a3b03dde854f3db269e7bdd
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800usb.c b/trunk/drivers/net/wireless/rt2x00/rt2800usb.c
index 3856f06fdca7..c82474ebba31 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -1463,6 +1463,10 @@ static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev)
 	/*
 	 * ASIC will keep garbage value after boot, clear encryption keys.
 	 */
+	for (i = 0; i < 4; i++)
+		rt2x00usb_register_write(rt2x00dev,
+					 SHARED_KEY_MODE_ENTRY(i), 0);
+
 	for (i = 0; i < 256; i++) {
 		u32 wcid[2] = { 0xffffffff, 0x00ffffff };
 		rt2x00usb_register_multiwrite(rt2x00dev, MAC_WCID_ENTRY(i),
@@ -1472,10 +1476,6 @@ static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev)
 		rt2x00usb_register_write(rt2x00dev, MAC_IVEIV_ENTRY(i), 0);
 	}
 
-	for (i = 0; i < 16; i++)
-		rt2x00usb_register_write(rt2x00dev,
-					 SHARED_KEY_MODE_ENTRY(i), 0);
-
 	/*
 	 * Clear all beacons
 	 * For the Beacon base registers we only need to clear
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800usb.h b/trunk/drivers/net/wireless/rt2x00/rt2800usb.h
index 2d9dc3783361..a79a6d90eeac 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2800usb.h
+++ b/trunk/drivers/net/wireless/rt2x00/rt2800usb.h
@@ -1300,8 +1300,8 @@
  * PAIRWISE_KEY_TABLE_BASE: 32-byte * 256 entry
  * MAC_IVEIV_TABLE_BASE: 8-byte * 256-entry
  * MAC_WCID_ATTRIBUTE_BASE: 4-byte * 256-entry
- * SHARED_KEY_TABLE_BASE: 32-byte * 16-entry
- * SHARED_KEY_MODE_BASE: 4-byte * 16-entry
+ * SHARED_KEY_TABLE_BASE: 32 bytes * 32-entry
+ * SHARED_KEY_MODE_BASE: 4 bits * 32-entry
  */
 #define MAC_WCID_BASE			0x1800
 #define PAIRWISE_KEY_TABLE_BASE		0x4000