diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2008-02-03 09:51:47 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-02-29 15:19:28 -0500 |
commit | 871ff6ed64e17a785cb4d48f56beedff038cc42a (patch) | |
tree | fd68aedc4492d3f6137fe350ab2a20d120479645 /drivers/net | |
parent | 6bb40dd13b458beb55f5c60dba1cb28e814bd640 (diff) |
rt2x00: Remove TX_MGMT queue usage
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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 5 | ||||
-rw-r--r-- | 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 b432cc21d248..534e1647b7cf 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
@@ -1436,7 +1436,6 @@ static void rt61pci_disable_radio(struct rt2x00_dev *rt2x00dev) | |||
1436 | rt2x00_set_field32(®, TX_CNTL_CSR_ABORT_TX_AC1, 1); | 1436 | rt2x00_set_field32(®, TX_CNTL_CSR_ABORT_TX_AC1, 1); |
1437 | rt2x00_set_field32(®, TX_CNTL_CSR_ABORT_TX_AC2, 1); | 1437 | rt2x00_set_field32(®, TX_CNTL_CSR_ABORT_TX_AC2, 1); |
1438 | rt2x00_set_field32(®, TX_CNTL_CSR_ABORT_TX_AC3, 1); | 1438 | rt2x00_set_field32(®, TX_CNTL_CSR_ABORT_TX_AC3, 1); |
1439 | rt2x00_set_field32(®, TX_CNTL_CSR_ABORT_TX_MGMT, 1); | ||
1440 | rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg); | 1439 | rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg); |
1441 | 1440 | ||
1442 | /* | 1441 | /* |
@@ -1611,8 +1610,6 @@ static void rt61pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev, | |||
1611 | (queue == IEEE80211_TX_QUEUE_DATA2)); | 1610 | (queue == IEEE80211_TX_QUEUE_DATA2)); |
1612 | rt2x00_set_field32(®, TX_CNTL_CSR_KICK_TX_AC3, | 1611 | rt2x00_set_field32(®, TX_CNTL_CSR_KICK_TX_AC3, |
1613 | (queue == IEEE80211_TX_QUEUE_DATA3)); | 1612 | (queue == IEEE80211_TX_QUEUE_DATA3)); |
1614 | rt2x00_set_field32(®, TX_CNTL_CSR_KICK_TX_MGMT, | ||
1615 | (queue == IEEE80211_TX_QUEUE_DATA4)); | ||
1616 | rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg); | 1613 | rt2x00pci_register_write(rt2x00dev, TX_CNTL_CSR, reg); |
1617 | } | 1614 | } |
1618 | 1615 | ||
@@ -2212,7 +2209,7 @@ static void rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) | |||
2212 | rt2x00dev->hw->extra_tx_headroom = 0; | 2209 | rt2x00dev->hw->extra_tx_headroom = 0; |
2213 | rt2x00dev->hw->max_signal = MAX_SIGNAL; | 2210 | rt2x00dev->hw->max_signal = MAX_SIGNAL; |
2214 | rt2x00dev->hw->max_rssi = MAX_RX_SSI; | 2211 | rt2x00dev->hw->max_rssi = MAX_RX_SSI; |
2215 | rt2x00dev->hw->queues = 5; | 2212 | rt2x00dev->hw->queues = 4; |
2216 | 2213 | ||
2217 | SET_IEEE80211_DEV(rt2x00dev->hw, &rt2x00dev_pci(rt2x00dev)->dev); | 2214 | SET_IEEE80211_DEV(rt2x00dev->hw, &rt2x00dev_pci(rt2x00dev)->dev); |
2218 | SET_IEEE80211_PERM_ADDR(rt2x00dev->hw, | 2215 | SET_IEEE80211_PERM_ADDR(rt2x00dev->hw, |
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 7907fd0d4aa5..b519a4bfc212 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -1796,7 +1796,7 @@ static void rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) | |||
1796 | rt2x00dev->hw->extra_tx_headroom = TXD_DESC_SIZE; | 1796 | rt2x00dev->hw->extra_tx_headroom = TXD_DESC_SIZE; |
1797 | rt2x00dev->hw->max_signal = MAX_SIGNAL; | 1797 | rt2x00dev->hw->max_signal = MAX_SIGNAL; |
1798 | rt2x00dev->hw->max_rssi = MAX_RX_SSI; | 1798 | rt2x00dev->hw->max_rssi = MAX_RX_SSI; |
1799 | rt2x00dev->hw->queues = 5; | 1799 | rt2x00dev->hw->queues = 4; |
1800 | 1800 | ||
1801 | SET_IEEE80211_DEV(rt2x00dev->hw, &rt2x00dev_usb(rt2x00dev)->dev); | 1801 | SET_IEEE80211_DEV(rt2x00dev->hw, &rt2x00dev_usb(rt2x00dev)->dev); |
1802 | SET_IEEE80211_PERM_ADDR(rt2x00dev->hw, | 1802 | SET_IEEE80211_PERM_ADDR(rt2x00dev->hw, |