From patchwork Thu May 6 10:29:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 97330 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 o46AfFpF024690 for ; Thu, 6 May 2010 10:46:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753423Ab0EFK36 (ORCPT ); Thu, 6 May 2010 06:29:58 -0400 Received: from mail-bw0-f219.google.com ([209.85.218.219]:52386 "EHLO mail-bw0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753084Ab0EFK35 (ORCPT ); Thu, 6 May 2010 06:29:57 -0400 Received: by bwz19 with SMTP id 19so400457bwz.21 for ; Thu, 06 May 2010 03:29:56 -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=59mqelyBpd40BAhTWtx6DpiWxpsrPyduJ26GQieVE6s=; b=o3VyLv0CRhQWs7BNfQO0BlTK7hLg3xIwHYlYsmTB3THh17getZlMLPEa/l4UXMpAnu 08Of4cvcg2XUbGtkZivDKPrm0RoKnxIZ7S5xZUWJdpWib58rUSdY5xYmU+Y5FTv0UYgY mL3qZRo0rUQKlRRYW1zk7wYPc3ROLrmlbFqv0= 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=fxJBrVINzTkyNhNt1HwG8wXFvXrnskZlLQij0tBkRocb7vbfXlowFU5LcL3Q8TwBUn WbezaPukJi2kgw8jwx9pgZ2Kl+brlvy/Z0Tu8u5fgww8aQnM4foIo9IdtwG+5kB97a4w daNlQoYam0PdbER7Sqh1hZmsfX5Wx9wIIWW2c= Received: by 10.204.21.17 with SMTP id h17mr2630682bkb.197.1273141796231; Thu, 06 May 2010 03:29:56 -0700 (PDT) Received: from helmutmobil.localnet (p5495C929.dip.t-dialin.net [84.149.201.41]) by mx.google.com with ESMTPS id 16sm285804bwz.1.2010.05.06.03.29.55 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 06 May 2010 03:29:55 -0700 (PDT) From: Helmut Schaa Subject: [PATCH 2/3] rt2x00: rt2800: don't overwrite SIFS values on erp changes Date: Thu, 6 May 2010 12:29:44 +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.44923.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:56 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index f786068..858455f 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -640,8 +640,6 @@ void rt2800_config_erp(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_erp *erp) rt2800_register_write(rt2x00dev, BKOFF_SLOT_CFG, reg); rt2800_register_read(rt2x00dev, XIFS_TIME_CFG, ®); - rt2x00_set_field32(®, XIFS_TIME_CFG_CCKM_SIFS_TIME, erp->sifs); - rt2x00_set_field32(®, XIFS_TIME_CFG_OFDM_SIFS_TIME, erp->sifs); rt2x00_set_field32(®, XIFS_TIME_CFG_EIFS, erp->eifs); rt2800_register_write(rt2x00dev, XIFS_TIME_CFG, reg);