From patchwork Thu May 6 10:29:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 97329 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o46AfFpE024690 for ; Thu, 6 May 2010 10:46:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752842Ab0EFK3T (ORCPT ); Thu, 6 May 2010 06:29:19 -0400 Received: from mail-bw0-f219.google.com ([209.85.218.219]:42662 "EHLO mail-bw0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751932Ab0EFK3S (ORCPT ); Thu, 6 May 2010 06:29:18 -0400 Received: by bwz19 with SMTP id 19so400099bwz.21 for ; Thu, 06 May 2010 03:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:from:subject:date:user-agent :mime-version:to:cc:content-type:content-transfer-encoding :message-id; bh=2BXSS67EyTLMbg1AnkX2MenHbW+54jSOb/3vmph0KNc=; b=cZAcofBWMOjE6/S11lHBiTju0AU/4RQSuCsJYpxLN0mm7KlOhb98Jidbnp3xgXVPs2 VuqMhwYfqLhSWbaNrmGOLUW7UvDqT8dQSUDcHxiHpllSRdGJPzUXWl5V2IO3UBz9+St+ tFlknQ8xsKqsPHUTU2OINfq2ZkzXKXV2qK/A4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:subject:date:user-agent:mime-version:to:cc:content-type :content-transfer-encoding:message-id; b=GQooBg5PGTtNLKN+MBDw0ZWxlJ1m4O7vPG96x3DWFDYYz1byBRDY+Qpih2STAUlHxJ 3aBKGm8/uuIYc0ixGmAzC+4Ao3DQhcUNskRe3XF6Qhb5oY0+rAblSA5HjZC44EiJ60cl QdrralkZiKeD3MFO5zyoERE3OPDKY0Vvd7sVU= Received: by 10.204.6.193 with SMTP id a1mr6342201bka.104.1273141757318; Thu, 06 May 2010 03:29:17 -0700 (PDT) Received: from helmutmobil.localnet (p5495C929.dip.t-dialin.net [84.149.201.41]) by mx.google.com with ESMTPS id 13sm290280bwz.11.2010.05.06.03.29.15 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 06 May 2010 03:29:16 -0700 (PDT) From: Helmut Schaa Subject: [PATCH 1/3] rt2x00: rt2800: update initial SIFS values Date: Thu, 6 May 2010 12:29:04 +0200 User-Agent: KMail/1.12.4 (Linux/2.6.34-rc5-wl-default; KDE/4.3.5; x86_64; ; ) MIME-Version: 1.0 To: John Linville Cc: linux-wireless@vger.kernel.org, Ivo van Doorn , Gertjan van Wingerde Message-Id: <201005061229.04897.helmut.schaa@googlemail.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 (demeter.kernel.org [140.211.167.41]); Thu, 06 May 2010 10:46:53 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index e37bbea..f786068 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -1415,9 +1415,16 @@ int rt2800_init_registers(struct rt2x00_dev *rt2x00dev) rt2800_register_write(rt2x00dev, EXP_ACK_TIME, 0x002400ca); + /* + * Usually the CCK SIFS time should be set to 10 and the OFDM SIFS + * time should be set to 16. However, the original Ralink driver uses + * 16 for both and indeed using a value of 10 for CCK SIFS results in + * connection problems with 11g + CTS protection. Hence, use the same + * defaults as the Ralink driver: 16 for both, CCK and OFDM SIFS. + */ rt2800_register_read(rt2x00dev, XIFS_TIME_CFG, ®); - rt2x00_set_field32(®, XIFS_TIME_CFG_CCKM_SIFS_TIME, 32); - rt2x00_set_field32(®, XIFS_TIME_CFG_OFDM_SIFS_TIME, 32); + rt2x00_set_field32(®, XIFS_TIME_CFG_CCKM_SIFS_TIME, 16); + rt2x00_set_field32(®, XIFS_TIME_CFG_OFDM_SIFS_TIME, 16); rt2x00_set_field32(®, XIFS_TIME_CFG_OFDM_XIFS_TIME, 4); rt2x00_set_field32(®, XIFS_TIME_CFG_EIFS, 314); rt2x00_set_field32(®, XIFS_TIME_CFG_BB_RXEND_ENABLE, 1);