From patchwork Wed Sep 8 18:56:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 164181 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o88IwDCe029063 for ; Wed, 8 Sep 2010 18:58:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753284Ab0IHS6L (ORCPT ); Wed, 8 Sep 2010 14:58:11 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:36123 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753273Ab0IHS6K (ORCPT ); Wed, 8 Sep 2010 14:58:10 -0400 Received: by ewy23 with SMTP id 23so343042ewy.19 for ; Wed, 08 Sep 2010 11:58:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :user-agent:cc:references:in-reply-to:mime-version:content-type :content-transfer-encoding:message-id; bh=94O+a48dJpXicfZ8wCwSflOjxspwN9nG11MQKVzXUJU=; b=fxjXmgr4Be6+G2/yNdVG1aFuWdF3yyvrGwi0Rn0mUP0XxhF+2CwwQO5wgB+dwifWp7 UYFZcOSm6FHZXLpU5gaCYVBQ7BoVRXakCw2HeUZK0zooU4TzlRlfSlBr+Kv7LSv7v9Nl l7NOKJA03CF62qZVkqWda1KsJ4lhCzvd84lZA= DomainKey-Signature: a=rsa-sha1; c=nofws; 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; b=hpSFv0yh/cfsqcr2uMfokmlUP3izloS8AmMZZ9AA7vzB8n9GAHmjypYpF3L2YhMR1P f0spFEFqcSRot9e3xe0+UZmaKosIdMn8s+vTYAFrIDk6mK1yud1yk+DwMD+TyfdWR1Vi LqO0oIGZ9mb4fdDFfMgBX316HraKwd0Syd9GQ= Received: by 10.213.17.82 with SMTP id r18mr2903eba.18.1283972288710; Wed, 08 Sep 2010 11:58:08 -0700 (PDT) Received: from localhost.localdomain (a0236.upc-a.chello.nl [62.163.0.236]) by mx.google.com with ESMTPS id u9sm538910eeh.11.2010.09.08.11.58.04 (version=SSLv3 cipher=RC4-MD5); Wed, 08 Sep 2010 11:58:08 -0700 (PDT) From: Ivo van Doorn To: "John W. Linville" Subject: [PATCH 02/06] rt2x00: Initialize AMPDU_BA_WINSIZE register Date: Wed, 8 Sep 2010 20:56:04 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.32.21-166.fc12.x86_64; KDE/4.4.5; x86_64; ; ) Cc: users@rt2x00.serialmonkey.com, linux-wireless@vger.kernel.org, Helmut Schaa References: <201009082055.38033.IvDoorn@gmail.com> In-Reply-To: <201009082055.38033.IvDoorn@gmail.com> MIME-Version: 1.0 Message-Id: <201009082056.05708.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.3 (demeter1.kernel.org [140.211.167.41]); Wed, 08 Sep 2010 18:58:13 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h index 70a5cb8..2edc774 100644 --- a/drivers/net/wireless/rt2x00/rt2800.h +++ b/drivers/net/wireless/rt2x00/rt2800.h @@ -639,6 +639,18 @@ #define LED_CFG_LED_POLAR FIELD32(0x40000000) /* + * AMPDU_BA_WINSIZE: Force BlockAck window size + * FORCE_WINSIZE_ENABLE: + * 0: Disable forcing of BlockAck window size + * 1: Enable forcing of BlockAck window size, overwrites values BlockAck + * window size values in the TXWI + * FORCE_WINSIZE: BlockAck window size + */ +#define AMPDU_BA_WINSIZE 0x1040 +#define AMPDU_BA_WINSIZE_FORCE_WINSIZE_ENABLE FIELD32(0x00000020) +#define AMPDU_BA_WINSIZE_FORCE_WINSIZE FIELD32(0x0000001f) + +/* * XIFS_TIME_CFG: MAC timing * CCKM_SIFS_TIME: unit 1us. Applied after CCK RX/TX * OFDM_SIFS_TIME: unit 1us. Applied after OFDM RX/TX diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 27a6e22..9cfb9b31 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -2053,6 +2053,14 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev) rt2800_register_write(rt2x00dev, LG_FBK_CFG1, reg); /* + * Do not force the BA window size, we use the TXWI to set it + */ + rt2800_register_read(rt2x00dev, AMPDU_BA_WINSIZE, ®); + rt2x00_set_field32(®, AMPDU_BA_WINSIZE_FORCE_WINSIZE_ENABLE, 0); + rt2x00_set_field32(®, AMPDU_BA_WINSIZE_FORCE_WINSIZE, 0); + rt2800_register_write(rt2x00dev, AMPDU_BA_WINSIZE, reg); + + /* * We must clear the error counters. * These registers are cleared on read, * so we may pass a useless variable to store the value.