---

yaml --- r: 266047 b: refs/heads/master c: d7d259d h: refs/heads/master i: 266045: a6aa0ca 266043: 9aed9d1 266039: bbac5f0 266031: 1c29746 266015: 03d3b2a 265983: d5509a1 v: v3
git-mirror · Sep 14, 2011 · e3db1ea · e3db1ea
1 parent 9d88842
commit e3db1ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af35323db6a177514ef6c77b961bf9db31648cd9
+refs/heads/master: d7d259d3a5e5975b8d0b67759f2632fbd0d508d2
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800lib.c b/trunk/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -2846,11 +2846,8 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
 					 SHARED_KEY_MODE_ENTRY(i), 0);
 
 	for (i = 0; i < 256; i++) {
-		static const u32 wcid[2] = { 0xffffffff, 0x00ffffff };
-		rt2800_register_multiwrite(rt2x00dev, MAC_WCID_ENTRY(i),
-					      wcid, sizeof(wcid));
-
-		rt2800_register_write(rt2x00dev, MAC_WCID_ATTR_ENTRY(i), 0);
+		rt2800_config_wcid(rt2x00dev, NULL, i);
+		rt2800_delete_wcid_attr(rt2x00dev, i);
 		rt2800_register_write(rt2x00dev, MAC_IVEIV_ENTRY(i), 0);
 	}