From patchwork Wed Nov  4 17:32:24 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
X-Patchwork-Id: 57723
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 nA4HlOen015848
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Wed, 4 Nov 2009 17:47:25 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932123AbZKDRcr (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Wed, 4 Nov 2009 12:32:47 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755816AbZKDRcq
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Wed, 4 Nov 2009 12:32:46 -0500
Received: from fg-out-1718.google.com ([72.14.220.158]:41096 "EHLO
	fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755792AbZKDRco (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Wed, 4 Nov 2009 12:32:44 -0500
Received: by fg-out-1718.google.com with SMTP id d23so1958951fga.1
	for <multiple recipients>; Wed, 04 Nov 2009 09:32:49 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:from:to:cc:date:message-id
	:in-reply-to:references:subject;
	bh=lvOiBFsVQdqfTq/qQJqoyO+4ZmFAGrFNgVMHpp69bxc=;
	b=wBAcQZOF/nrL1ivp+REbm+FznkhL5Q1guXH01+Duk82KkcS3YVcKELr27xXFV9uJNw
	gBhxTXMt6vKLGaCiO6lG2W4tLPTxdFzJlVXZX4neYinZWgLfwKA6NCznIBZYyjeDV0px
	G2J5wIfw0ALQqPZU8o7NrcIKTzJ1fhoSerKXQ=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=from:to:cc:date:message-id:in-reply-to:references:subject;
	b=PuNztqoAA6HYDbgWv+MKWtUopis3thNdMU+byvui4VbsB+li3hsTKBxCHyWIaiBUMR
	a5jzghhDmmdpYG6pFyt06GfuufGG4DvwJyQU0VQdj3kgFYYgRpmU7etisWMFNzSSP9FK
	dCRufHqtb9sYftUgqqpg2J/WZBqeJZ7EgubWw=
Received: by 10.86.158.5 with SMTP id g5mr4161667fge.32.1257355969606;
	Wed, 04 Nov 2009 09:32:49 -0800 (PST)
Received: from localhost.localdomain (chello089079027028.chello.pl
	[89.79.27.28]) by mx.google.com with ESMTPS id
	e20sm2205980fga.20.2009.11.04.09.32.47
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Wed, 04 Nov 2009 09:32:48 -0800 (PST)
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: linux-wireless@vger.kernel.org
Cc: Gertjan van Wingerde <gwingerde@gmail.com>,
	Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
	Ivo van Doorn <ivdoorn@gmail.com>, linux-kernel@vger.kernel.org,
	"John W. Linville" <linville@tuxdriver.com>
Date: Wed, 04 Nov 2009 18:32:24 +0100
Message-Id: <20091104173224.28463.49296.sendpatchset@localhost.localdomain>
In-Reply-To: <20091104173151.28463.68742.sendpatchset@localhost.localdomain>
References: <20091104173151.28463.68742.sendpatchset@localhost.localdomain>
Subject: [PATCH 04/41] rt2800pci: fix crypto in TX frame
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


Index: b/drivers/net/wireless/rt2x00/rt2800pci.c
===================================================================
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -2195,7 +2195,7 @@ static void rt2800pci_write_tx_desc(stru
 	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,