diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2400pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2400pci.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c index 06b92f8b7a55..6126c0ab5880 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/rt2x00/rt2400pci.c | |||
@@ -1060,7 +1060,8 @@ static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, | |||
1060 | /* | 1060 | /* |
1061 | * TX data initialization | 1061 | * TX data initialization |
1062 | */ | 1062 | */ |
1063 | static void rt2400pci_write_beacon(struct queue_entry *entry) | 1063 | static void rt2400pci_write_beacon(struct queue_entry *entry, |
1064 | struct txentry_desc *txdesc) | ||
1064 | { | 1065 | { |
1065 | struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev; | 1066 | struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev; |
1066 | struct queue_entry_priv_pci *entry_priv = entry->priv_data; | 1067 | struct queue_entry_priv_pci *entry_priv = entry->priv_data; |
@@ -1090,6 +1091,14 @@ static void rt2400pci_write_beacon(struct queue_entry *entry) | |||
1090 | rt2x00_desc_read(entry_priv->desc, 1, &word); | 1091 | rt2x00_desc_read(entry_priv->desc, 1, &word); |
1091 | rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, skbdesc->skb_dma); | 1092 | rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, skbdesc->skb_dma); |
1092 | rt2x00_desc_write(entry_priv->desc, 1, word); | 1093 | rt2x00_desc_write(entry_priv->desc, 1, word); |
1094 | |||
1095 | /* | ||
1096 | * Enable beaconing again. | ||
1097 | */ | ||
1098 | rt2x00_set_field32(®, CSR14_TSF_COUNT, 1); | ||
1099 | rt2x00_set_field32(®, CSR14_TBCN, 1); | ||
1100 | rt2x00_set_field32(®, CSR14_BEACON_GEN, 1); | ||
1101 | rt2x00pci_register_write(rt2x00dev, CSR14, reg); | ||
1093 | } | 1102 | } |
1094 | 1103 | ||
1095 | static void rt2400pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev, | 1104 | static void rt2400pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev, |
@@ -1097,17 +1106,6 @@ static void rt2400pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev, | |||
1097 | { | 1106 | { |
1098 | u32 reg; | 1107 | u32 reg; |
1099 | 1108 | ||
1100 | if (queue == QID_BEACON) { | ||
1101 | rt2x00pci_register_read(rt2x00dev, CSR14, ®); | ||
1102 | if (!rt2x00_get_field32(reg, CSR14_BEACON_GEN)) { | ||
1103 | rt2x00_set_field32(®, CSR14_TSF_COUNT, 1); | ||
1104 | rt2x00_set_field32(®, CSR14_TBCN, 1); | ||
1105 | rt2x00_set_field32(®, CSR14_BEACON_GEN, 1); | ||
1106 | rt2x00pci_register_write(rt2x00dev, CSR14, reg); | ||
1107 | } | ||
1108 | return; | ||
1109 | } | ||
1110 | |||
1111 | rt2x00pci_register_read(rt2x00dev, TXCSR0, ®); | 1109 | rt2x00pci_register_read(rt2x00dev, TXCSR0, ®); |
1112 | rt2x00_set_field32(®, TXCSR0_KICK_PRIO, (queue == QID_AC_BE)); | 1110 | rt2x00_set_field32(®, TXCSR0_KICK_PRIO, (queue == QID_AC_BE)); |
1113 | rt2x00_set_field32(®, TXCSR0_KICK_TX, (queue == QID_AC_BK)); | 1111 | rt2x00_set_field32(®, TXCSR0_KICK_TX, (queue == QID_AC_BK)); |