From patchwork Thu Sep 8 12:39:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 1129522 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p88CdUIq026435 for ; Thu, 8 Sep 2011 12:39:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932662Ab1IHMji (ORCPT ); Thu, 8 Sep 2011 08:39:38 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:47845 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932607Ab1IHMjg (ORCPT ); Thu, 8 Sep 2011 08:39:36 -0400 Received: by mail-ey0-f174.google.com with SMTP id 24so422913eyx.19 for ; Thu, 08 Sep 2011 05:39:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; bh=/jf+V9+0RdjHnxhIoSOyJv+7EXnXllDNY0vtj721A9o=; b=xhqI895eUrPYk0V3gme/bqs2odOxjgiePOPIDjE7XSVHuBHGYLxYRu+QirzrVz0UK2 9B+or9MN6QFRg2EBQsd1spdeR6H9FIybc/sqMXlfPliiIDED98KUCcQUUYFXbfQRLasl ahJmIdJ5vtORJNn/LseX/V6vg5eMFnN8IrQFM= Received: by 10.14.18.198 with SMTP id l46mr217974eel.179.1315485576173; Thu, 08 Sep 2011 05:39:36 -0700 (PDT) Received: from localhost.localdomain (g121037.upc-g.chello.nl [80.57.121.37]) by mx.google.com with ESMTPS id d12sm6401406eeb.8.2011.09.08.05.39.34 (version=SSLv3 cipher=OTHER); Thu, 08 Sep 2011 05:39:35 -0700 (PDT) From: Ivo van Doorn To: "John W. Linville" Subject: [PATCH 7/7] rt2x00: Use the available helper functions to initialize the WCID table Date: Thu, 8 Sep 2011 14:39:04 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.x86_64; KDE/4.4.5; x86_64; ; ) Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com References: <201109081434.23635.IvDoorn@gmail.com> <201109081438.02330.IvDoorn@gmail.com> <201109081438.37130.IvDoorn@gmail.com> In-Reply-To: <201109081438.37130.IvDoorn@gmail.com> MIME-Version: 1.0 Message-Id: <201109081439.05539.IvDoorn@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 08 Sep 2011 12:39:43 +0000 (UTC) From: Helmut Schaa Use rt2800_config_wcid and rt2800_delete_wcid_attr to initialize the WCID table instead of writing to the registers directly. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn --- drivers/net/wireless/rt2x00/rt2800lib.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 2f4d51a..3d9f355 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/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); }