From patchwork Thu Oct 15 19:17:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 54074 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9FJJGDh022051 for ; Thu, 15 Oct 2009 19:19:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762963AbZJOTRw (ORCPT ); Thu, 15 Oct 2009 15:17:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762962AbZJOTRw (ORCPT ); Thu, 15 Oct 2009 15:17:52 -0400 Received: from mail-ew0-f208.google.com ([209.85.219.208]:42515 "EHLO mail-ew0-f208.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762939AbZJOTRv (ORCPT ); Thu, 15 Oct 2009 15:17:51 -0400 Received: by ewy4 with SMTP id 4so882040ewy.37 for ; Thu, 15 Oct 2009 12:17:14 -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:mime-version:content-type:content-transfer-encoding :content-disposition:message-id; bh=xcpZtf092fJ9zYc3Zh2H/HlBGqv7YcXMVRf1UAEevt4=; b=Sq8UBS8F63WYahicHwbxIS1hZJstqoQ2HFfnxOb4X+cnQIerhTWGG3DWIBiRsg78V1 9FTWJceZL0CzLMAohJZxSaq3KGUpuSaQr0ViHy7lRNRdnpqi8elcO436GK0+mnX/k6KE nrEfDmW6ynfcdDFfjP0GnEm//YeKZ2fqNiMo4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:mime-version:content-type :content-transfer-encoding:content-disposition:message-id; b=qLAksQP6WXz/dqVkt0Wtk97tWeHtJ9um9hcuMVLpBiJzonKe/DmpSRy/P9kBrSKwGV c9RnzeXXie8hhXcrC15oY3N/3zJDTr54QnfzuZZHqvEdpwstlPUTC3byVv2Ev/74rEGI aRIldfBrF/QqZw8w9AQbWRwNRwOY3DfoQjTHY= Received: by 10.211.19.17 with SMTP id w17mr9569568ebi.92.1255634234087; Thu, 15 Oct 2009 12:17:14 -0700 (PDT) Received: from ?192.168.8.43? (a0236.upc-a.chello.nl [62.163.0.236]) by mx.google.com with ESMTPS id 5sm366505eyh.33.2009.10.15.12.17.12 (version=SSLv3 cipher=RC4-MD5); Thu, 15 Oct 2009 12:17:12 -0700 (PDT) From: Ivo van Doorn To: John Linville Subject: [PATCH] rt2x00: Fix crypto in TX frame for rt2800usb Date: Thu, 15 Oct 2009 21:17:09 +0200 User-Agent: KMail/1.9.10 Cc: linux-wireless@vger.kernel.org, users@host1.serialmonkey.com, Benoit PAPILLAULT MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200910152117.10567.IvDoorn@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index a084077..9fe770f 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c @@ -1994,7 +1994,7 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, rt2x00_set_field32(&word, TXWI_W1_BW_WIN_SIZE, txdesc->ba_size); rt2x00_set_field32(&word, TXWI_W1_WIRELESS_CLI_ID, test_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags) ? - (skbdesc->entry->entry_idx + 1) : 0xff); + txdesc->key_idx : 0xff); rt2x00_set_field32(&word, TXWI_W1_MPDU_TOTAL_BYTE_COUNT, skb->len - txdesc->l2pad); rt2x00_set_field32(&word, TXWI_W1_PACKETID,