rt2x00: Don't frequently reset beacon interval in AdHoc mode

[mv-sheeva.git] / drivers / net / wireless / rt2x00 / rt2400pci.c

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 9ec6691adf0d5782ea04182100a9025cb91646fb..62786608951e2b95bc7c740aff8a974008423f39 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1140,7 +1140,11 @@ static void rt2400pci_kill_tx_queue(struct data_queue *queue)
        u32 reg;
 
        if (queue->qid == QID_BEACON) {
-               rt2x00pci_register_write(rt2x00dev, CSR14, 0);
+               rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
+               rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 0);
+               rt2x00_set_field32(&reg, CSR14_TBCN, 0);
+               rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
+               rt2x00pci_register_write(rt2x00dev, CSR14, reg);
        } else {
                rt2x00pci_register_read(rt2x00dev, TXCSR0, &reg);
                rt2x00_set_field32(&reg, TXCSR0_ABORT, 1);