From: Ivo van Doorn <ivdoorn@gmail.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org, rt2400-devel@lists.sourceforge.net
Subject: [PATCH 11/19] rt2x00: Remove TX_MGMT queue usage
Date: Sun, 3 Feb 2008 15:51:47 +0100 [thread overview]
Message-ID: <200802031551.47373.IvDoorn@gmail.com> (raw)
In-Reply-To: <200802031541.52167.IvDoorn@gmail.com>
rt73usb doesn't have a 5th queue, correctly initialize hw->queues
rt61pci had a 5th queue but was removed recently, correctly initialize
hw->queues and remove the last remnants.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
drivers/net/wireless/rt2x00/rt61pci.c | 5 +----
drivers/net/wireless/rt2x00/rt73usb.c | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index aa6b1cf..2f1db99 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1435,7 +1435,6 @@ static void rt61pci_disable_radio(struct rt2x00_dev *rt2x00dev)
rt2x00_set_field32(®, TX_CNTL_CSR_ABORT_TX_AC1, 1);
rt2x00_set_field32(®, TX_CNTL_CSR_ABORT_TX_AC2, 1);
rt2x00_set_field32(®, TX_CNTL_CSR_ABORT_TX_AC3, 1);
- rt2x00_set_field32(®, TX_CNTL_CSR_ABORT_TX_MGMT, 1);
rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg);
/*
@@ -1608,8 +1607,6 @@ static void rt61pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
(queue == IEEE80211_TX_QUEUE_DATA2));
rt2x00_set_field32(®, TX_CNTL_CSR_KICK_TX_AC3,
(queue == IEEE80211_TX_QUEUE_DATA3));
- rt2x00_set_field32(®, TX_CNTL_CSR_KICK_TX_MGMT,
- (queue == IEEE80211_TX_QUEUE_DATA4));
rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg);
}
@@ -2209,7 +2206,7 @@ static void rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
rt2x00dev->hw->extra_tx_headroom = 0;
rt2x00dev->hw->max_signal = MAX_SIGNAL;
rt2x00dev->hw->max_rssi = MAX_RX_SSI;
- rt2x00dev->hw->queues = 5;
+ rt2x00dev->hw->queues = 4;
SET_IEEE80211_DEV(rt2x00dev->hw, &rt2x00dev_pci(rt2x00dev)->dev);
SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index be8bfc5..cff5eb4 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1793,7 +1793,7 @@ static void rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
rt2x00dev->hw->extra_tx_headroom = TXD_DESC_SIZE;
rt2x00dev->hw->max_signal = MAX_SIGNAL;
rt2x00dev->hw->max_rssi = MAX_RX_SSI;
- rt2x00dev->hw->queues = 5;
+ rt2x00dev->hw->queues = 4;
SET_IEEE80211_DEV(rt2x00dev->hw, &rt2x00dev_usb(rt2x00dev)->dev);
SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
--
1.5.3.8
next prev parent reply other threads:[~2008-02-03 14:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-03 14:41 Please pull 'upstream' branch of rt2x00 Ivo van Doorn
2008-02-03 14:42 ` [PATCH 01/19] rt2x00: Update copyright notice Ivo van Doorn
2008-02-03 14:45 ` [PATCH 02/19] rt2x00: Queue handling overhaul Ivo van Doorn
2008-02-03 14:46 ` [PATCH 03/19] rt2x00: don't write past the end when writing short descriptors on rt61 Ivo van Doorn
2008-02-03 14:47 ` [PATCH 04/19] rt2x00: Add new USB ID to rt2500usb Ivo van Doorn
2008-02-03 14:47 ` [PATCH 05/19] rt2x00: Fix tx parameter initialization Ivo van Doorn
2008-02-03 14:48 ` [PATCH 06/19] rt2x00: Enable master and adhoc mode again Ivo van Doorn
2008-02-03 14:48 ` [PATCH 07/19] rt2x00: Driver requiring firmware should select crc algo Ivo van Doorn
2008-02-03 14:49 ` [PATCH 08/19] rt2x00: Add per-interface structure Ivo van Doorn
2008-02-03 14:50 ` [PATCH 09/19] rt2x00: Rate structure overhaul Ivo van Doorn
2008-02-03 14:51 ` [PATCH 10/19] rt2x00: Remove HWMODE_{A,B,G} Ivo van Doorn
2008-02-03 14:51 ` Ivo van Doorn [this message]
2008-02-03 14:52 ` [PATCH 12/19] rt2x00: Initialize QID from queue->qid Ivo van Doorn
2008-02-03 14:52 ` [PATCH 13/19] rt2x00: Use ieee80211_channel_to_frequency() Ivo van Doorn
2008-02-03 14:53 ` [PATCH 14/19] rt2x00: Make use of MAC80211_LED_TRIGGERS Ivo van Doorn
2008-02-03 14:54 ` [PATCH 15/19] rt2x00: Enable LED class support for rt2500usb/rt73usb Ivo van Doorn
2008-02-03 14:54 ` [PATCH 16/19] rt2x00: Fix rate initialization Ivo van Doorn
2008-02-03 14:54 ` [PATCH 17/19] rt2x00: Move beacon and atim queue defines into rt2x00 Ivo van Doorn
2008-02-03 14:55 ` [PATCH 18/19] rt2x00: Fix queue index handling Ivo van Doorn
2008-02-03 14:56 ` [PATCH 19/19] rt2x00: Release rt2x00 2.1.0 Ivo van Doorn
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=200802031551.47373.IvDoorn@gmail.com \
--to=ivdoorn@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=rt2400-devel@lists.sourceforge.net \
/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;
as well as URLs for NNTP newsgroup(s).