rt2x00: Only set the TBCN flag when the interface is configured to send beacons.

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / rt2x00 / rt2500usb.c

diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 2a38388a79e146433535af533b3c65b844d4d6d9..531d6a02755a90839e95006c8330b7234267a0f5 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -327,7 +327,8 @@ static void rt2500usb_config_type(struct rt2x00_dev *rt2x00dev, const int type,
 
        rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg);
        rt2x00_set_field16(&reg, TXRX_CSR19_TSF_COUNT, 1);
-       rt2x00_set_field16(&reg, TXRX_CSR19_TBCN, 1);
+       rt2x00_set_field16(&reg, TXRX_CSR19_TBCN,
+                          (tsf_sync == TSF_SYNC_BEACON));
        rt2x00_set_field16(&reg, TXRX_CSR19_BEACON_GEN, 0);
        rt2x00_set_field16(&reg, TXRX_CSR19_TSF_SYNC, tsf_sync);
        rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);