aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-02-10 16:47:46 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:37:18 -0500
commit16938a24ae19562f078fd43a28500526ff78cd87 (patch)
tree719a83b6df544800e3f9598ed6c49f6816d7ea97
parent25fd893db26e90a1e9cf8ba151395766c70a69b3 (diff)
rt2x00: Remove MGMT ring initialization
Remove the last remnants of the MGMT ring initialization from rt61pci.ko Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt61pci.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt61pci.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 25b3c6e2a556..a8ec910e5475 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1070,7 +1070,6 @@ static int rt61pci_init_queues(struct rt2x00_dev *rt2x00dev)
1070 rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_AC1, 2); 1070 rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_AC1, 2);
1071 rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_AC2, 2); 1071 rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_AC2, 2);
1072 rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_AC3, 2); 1072 rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_AC3, 2);
1073 rt2x00_set_field32(&reg, TX_DMA_DST_CSR_DEST_MGMT, 0);
1074 rt2x00pci_register_write(rt2x00dev, TX_DMA_DST_CSR, reg); 1073 rt2x00pci_register_write(rt2x00dev, TX_DMA_DST_CSR, reg);
1075 1074
1076 rt2x00pci_register_read(rt2x00dev, LOAD_TX_RING_CSR, &reg); 1075 rt2x00pci_register_read(rt2x00dev, LOAD_TX_RING_CSR, &reg);
@@ -1078,7 +1077,6 @@ static int rt61pci_init_queues(struct rt2x00_dev *rt2x00dev)
1078 rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_AC1, 1); 1077 rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_AC1, 1);
1079 rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_AC2, 1); 1078 rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_AC2, 1);
1080 rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_AC3, 1); 1079 rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_AC3, 1);
1081 rt2x00_set_field32(&reg, LOAD_TX_RING_CSR_LOAD_TXD_MGMT, 0);
1082 rt2x00pci_register_write(rt2x00dev, LOAD_TX_RING_CSR, reg); 1080 rt2x00pci_register_write(rt2x00dev, LOAD_TX_RING_CSR, reg);
1083 1081
1084 rt2x00pci_register_read(rt2x00dev, RX_CNTL_CSR, &reg); 1082 rt2x00pci_register_read(rt2x00dev, RX_CNTL_CSR, &reg);
diff --git a/drivers/net/wireless/rt2x00/rt61pci.h b/drivers/net/wireless/rt2x00/rt61pci.h
index d291c0fe405c..2f9a8899a3e8 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.h
+++ b/drivers/net/wireless/rt2x00/rt61pci.h
@@ -880,7 +880,7 @@ struct hw_pairwise_ta_entry {
880#define TX_CNTL_CSR_ABORT_TX_MGMT FIELD32(0x00100000) 880#define TX_CNTL_CSR_ABORT_TX_MGMT FIELD32(0x00100000)
881 881
882/* 882/*
883 * LOAD_TX_RING_CSR: Load RX de 883 * LOAD_TX_RING_CSR: Load RX desriptor
884 */ 884 */
885#define LOAD_TX_RING_CSR 0x3434 885#define LOAD_TX_RING_CSR 0x3434
886#define LOAD_TX_RING_CSR_LOAD_TXD_AC0 FIELD32(0x00000001) 886#define LOAD_TX_RING_CSR_LOAD_TXD_AC0 FIELD32(0x00000001)