From patchwork Thu May 13 09:36:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gertjan van Wingerde X-Patchwork-Id: 99262 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 o4D9bApr021652 for ; Thu, 13 May 2010 09:37:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758082Ab0EMJhI (ORCPT ); Thu, 13 May 2010 05:37:08 -0400 Received: from cpsmtpb-ews01.kpnxchange.com ([213.75.39.4]:1773 "EHLO cpsmtpb-ews01.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754287Ab0EMJhE (ORCPT ); Thu, 13 May 2010 05:37:04 -0400 Received: from cpbrm-ews29.kpnxchange.com ([10.94.84.160]) by cpsmtpb-ews01.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 13 May 2010 11:37:01 +0200 Received: from CPSMTPM-EML109.kpnxchange.com ([195.121.3.13]) by cpbrm-ews29.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 13 May 2010 11:37:00 +0200 Received: from wingerd.gvw.nl ([86.87.118.224]) by CPSMTPM-EML109.kpnxchange.com with Microsoft SMTPSVC(7.0.6001.18000); Thu, 13 May 2010 11:37:01 +0200 Received: by wingerd.gvw.nl (Postfix, from userid 501) id 9A32E60036; Thu, 13 May 2010 11:37:00 +0200 (CEST) From: Gertjan van Wingerde To: "John W. Linville" Cc: Ivo van Doorn , , , Gertjan van Wingerde Subject: [PATCH v2 05/10] rt2x00: Fix beacon descriptor writing for rt61pci. Date: Thu, 13 May 2010 11:36:53 +0200 Message-Id: <1273743418-28383-6-git-send-email-gwingerde@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1273743418-28383-1-git-send-email-gwingerde@gmail.com> References: <1273743418-28383-1-git-send-email-gwingerde@gmail.com> X-OriginalArrivalTime: 13 May 2010 09:37:01.0181 (UTC) FILETIME=[D6C9FAD0:01CAF27F] X-RecipientDomain: vger.kernel.org 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, 13 May 2010 09:37:10 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 2436363..99c2981 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c @@ -1801,12 +1801,12 @@ static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, rt2x00_set_field32(&word, TXD_W5_WAITING_DMA_DONE_INT, 1); rt2x00_desc_write(txd, 5, word); - rt2x00_desc_read(txd, 6, &word); - rt2x00_set_field32(&word, TXD_W6_BUFFER_PHYSICAL_ADDRESS, - skbdesc->skb_dma); - rt2x00_desc_write(txd, 6, word); + if (txdesc->queue != QID_BEACON) { + rt2x00_desc_read(txd, 6, &word); + rt2x00_set_field32(&word, TXD_W6_BUFFER_PHYSICAL_ADDRESS, + skbdesc->skb_dma); + rt2x00_desc_write(txd, 6, word); - if (skbdesc->desc_len > TXINFO_SIZE) { rt2x00_desc_read(txd, 11, &word); rt2x00_set_field32(&word, TXD_W11_BUFFER_LENGTH0, txdesc->length);