rt2x00: Clean up all driver's kick_tx_queue callback functions.

All of the driver's kick_tx_queue callback functions treat the TX queue
for beacons in a special manner.
Clean this up by integrating the kicking of the beacon queue into the
write_beacon callback function, and let the generic code no longer call
the kick_tx_queue callback function when updating the beacon.

Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 6f898913492a..9c13a4e0e731 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1089,6 +1089,14 @@ static void rt2400pci_write_beacon(struct queue_entry *entry)
         rt2x00_desc_read(entry_priv->desc, 1, &word);
         rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, skbdesc->skb_dma);
         rt2x00_desc_write(entry_priv->desc, 1, word);
+
+        /*
+         * Enable beaconing again.
+         */
+        rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
+        rt2x00_set_field32(&reg, CSR14_TBCN, 1);
+        rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 1);
+        rt2x00pci_register_write(rt2x00dev, CSR14, reg);
 }
 
 static void rt2400pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
@@ -1096,17 +1104,6 @@ static void rt2400pci_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
 {
         u32 reg;
 
-        if (queue == QID_BEACON) {
-                rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
-                if (!rt2x00_get_field32(reg, CSR14_BEACON_GEN)) {
-                        rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
-                        rt2x00_set_field32(&reg, CSR14_TBCN, 1);
-                        rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 1);
-                        rt2x00pci_register_write(rt2x00dev, CSR14, reg);
-                }
-                return;
-        }
-
         rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);
         rt2x00_set_field32(&reg, TXCSR0_KICK_PRIO, (queue == QID_AC_BE));
         rt2x00_set_field32(&reg, TXCSR0_KICK_TX, (queue == QID_AC_BK));