From patchwork Thu May 13 19:16:04 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: 99381 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 o4DJGeO7028901 for ; Thu, 13 May 2010 19:17:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759436Ab0EMTQP (ORCPT ); Thu, 13 May 2010 15:16:15 -0400 Received: from cpsmtpb-ews04.kpnxchange.com ([213.75.39.7]:2940 "EHLO cpsmtpb-ews04.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754232Ab0EMTQJ (ORCPT ); Thu, 13 May 2010 15:16:09 -0400 Received: from cpbrm-ews20.kpnxchange.com ([10.94.84.151]) by cpsmtpb-ews04.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 13 May 2010 21:16:07 +0200 Received: from CPSMTPM-EML109.kpnxchange.com ([195.121.3.13]) by cpbrm-ews20.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 13 May 2010 21:16:07 +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 21:16:07 +0200 Received: by wingerd.gvw.nl (Postfix, from userid 501) id 4B4C160036; Thu, 13 May 2010 21:16:07 +0200 (CEST) From: Gertjan van Wingerde To: "John W. Linville" Cc: Ivo van Doorn , , , Gertjan van Wingerde Subject: [PATCH 2/4] rt2x00: Fix rt2800usb TX descriptor writing. Date: Thu, 13 May 2010 21:16:04 +0200 Message-Id: <1273778166-3833-3-git-send-email-gwingerde@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1273778166-3833-1-git-send-email-gwingerde@gmail.com> References: <1273778166-3833-1-git-send-email-gwingerde@gmail.com> X-OriginalArrivalTime: 13 May 2010 19:16:08.0076 (UTC) FILETIME=[BD8D64C0:01CAF2D0] 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 19:17:34 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index 33d7ac9..eaf0a7e 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c @@ -414,7 +414,7 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, */ rt2x00_desc_read(txi, 0, &word); rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_PKT_LEN, - skb->len + TXWI_DESC_SIZE); + skb->len - TXINFO_DESC_SIZE); rt2x00_set_field32(&word, TXINFO_W0_WIV, !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc->flags)); rt2x00_set_field32(&word, TXINFO_W0_QSEL, 2);