From e3db1ead175afff4c9422ea31126feff055a5bea Mon Sep 17 00:00:00 2001 From: Helmut Schaa Date: Thu, 8 Sep 2011 14:39:04 +0200 Subject: [PATCH] --- yaml --- r: 266047 b: refs/heads/master c: d7d259d3a5e5975b8d0b67759f2632fbd0d508d2 h: refs/heads/master i: 266045: a6aa0ca5e6a3db75f1d3c64950e2b26bb85886c0 266043: 9aed9d1fe226dd7b0ead041f1fbdd48ac25de504 266039: bbac5f02d7dcbbebc86a3242ca8b709f399faed5 266031: 1c297462a3c3412eb78e111468a382f8f837c1e9 266015: 03d3b2a41526a5ba76316a78589cb9fa390fc418 265983: d5509a19279a0a29f5a8f31c5db97ab51521f41f v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2800lib.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 93eea4363988..117ff087ec92 100644 --- 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 index 9ff58231abcd..a5ddb39ca4a0 100644 --- 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); }