Linux wireless drivers development
 help / color / mirror / Atom feed
From: Gabor Juhos <juhosg@openwrt.org>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com,
	Gabor Juhos <juhosg@openwrt.org>
Subject: [PATCH v3 19/20] rt2x00: rt2800usb: use correct [RT]XWI size for RT3593
Date: Mon,  8 Jul 2013 16:08:34 +0200	[thread overview]
Message-ID: <1373292515-21332-20-git-send-email-juhosg@openwrt.org> (raw)
In-Reply-To: <1373292515-21332-1-git-send-email-juhosg@openwrt.org>

The RT3593 chipset requires different [RT]XWI size
values. Modify the driver to use the correct values.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Acked-by: Stanislaw Gruszka <stf_xl@wp.pl>
---
Changes since v2: ---
---
 drivers/net/wireless/rt2x00/rt2800.h    |    1 +
 drivers/net/wireless/rt2x00/rt2800usb.c |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 1ba797b..a313241 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -2814,6 +2814,7 @@ enum rt2800_eeprom_word {
 #define TXWI_DESC_SIZE_5WORDS		(5 * sizeof(__le32))
 
 #define RXWI_DESC_SIZE_4WORDS		(4 * sizeof(__le32))
+#define RXWI_DESC_SIZE_5WORDS		(5 * sizeof(__le32))
 #define RXWI_DESC_SIZE_6WORDS		(6 * sizeof(__le32))
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 840833b..c24c1fd 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -854,7 +854,10 @@ static void rt2800usb_queue_init(struct data_queue *queue)
 	struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;
 	unsigned short txwi_size, rxwi_size;
 
-	if (rt2x00_rt(rt2x00dev, RT5592)) {
+	if (rt2x00_rt(rt2x00dev, RT3593)) {
+		txwi_size = TXWI_DESC_SIZE_4WORDS;
+		rxwi_size = RXWI_DESC_SIZE_5WORDS;
+	} else if (rt2x00_rt(rt2x00dev, RT5592)) {
 		txwi_size = TXWI_DESC_SIZE_5WORDS;
 		rxwi_size = RXWI_DESC_SIZE_6WORDS;
 	} else {
-- 
1.7.10


  parent reply	other threads:[~2013-07-08 14:08 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-08 14:08 [PATCH v3 00/20] rt2x00: add experimental support for RT3593 Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 01/20] rt2x00: rt2800lib: add MAC register initialization " Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 02/20] rt2x00: rt2800lib: add BBP " Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 03/20] rt2x00: rt2800lib: add RFCSR " Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 04/20] rt2x00: rt2800lib: add BBP post " Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 05/20] rt2x00: rt2800lib: add TX power configuration " Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 06/20] rt2x00: rt2800lib: fix BBP1_TX_ANTENNA field configuration for 3T devices Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 07/20] rt2x00: rt2800lib: fix antenna configuration for RT3593 Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 08/20] rt2x00: rt2800lib: add rt2800_txpower_to_dev helper Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 09/20] rt2x00: rt2800lib: fix default TX power values for RT3593 Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 10/20] rt2x00: rt2800lib: introduce rt2800_get_txmixer_gain_{24,5}g helpers Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 11/20] rt2x00: rt2800lib: hardcode TX mixer gain values for RT3593 Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 12/20] rt2x00: rt2800lib: fix LNA_A[12] " Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 13/20] rt2x00: rt2800lib: add default_power3 field for three-chain devices Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 14/20] rt2x00: rt2800lib: add rf_vals for RF3053 Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 15/20] rt2x00: rt2800lib: add channel configuration " Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 16/20] rt2x00: rt2800lib: enable VCO recalibration " Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 17/20] rt2x00: rt2800lib: enable RF3053 support Gabor Juhos
2013-07-08 14:08 ` [PATCH v3 18/20] rt2x00: rt2800lib: enable RT3593 support Gabor Juhos
2013-07-08 14:08 ` Gabor Juhos [this message]
2013-07-08 14:08 ` [PATCH v3 20/20] rt2x00: rt2800usb: add USB device ID for Linksys AE3000 Gabor Juhos
2013-07-22 15:48 ` [PATCH v3 00/20] rt2x00: add experimental support for RT3593 Gertjan van Wingerde

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1373292515-21332-20-git-send-email-juhosg@openwrt.org \
    --to=juhosg@openwrt.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=users@rt2x00.serialmonkey.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox