Commit fd3c91c5 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Always enable TSF ticking 



Whatever mode we are in, according to the legacy drivers
we should always enable TSF ticking/counting.
We should also always enable the TBCN/TBTT field,
this field is only disabled during beacon regeneration.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 72fa559b

drivers/net/wireless/rt2x00/rt2400pci.c

+2 −0
Original line number Diff line number Diff line
@@ -291,7 +291,9 @@ static void rt2400pci_config_intf(struct rt2x00_dev *rt2x00dev, 
		 * Enable synchronisation.

		 */

		rt2x00pci_register_read(rt2x00dev, CSR14, &reg);

		rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);

		rt2x00_set_field32(&reg, CSR14_TSF_SYNC, conf->sync);

		rt2x00_set_field32(&reg, CSR14_TBCN, 1);

		rt2x00pci_register_write(rt2x00dev, CSR14, reg);

	}

drivers/net/wireless/rt2x00/rt2500pci.c

+2 −0
Original line number Diff line number Diff line
@@ -294,7 +294,9 @@ static void rt2500pci_config_intf(struct rt2x00_dev *rt2x00dev, 
		 * Enable synchronisation.

		 */

		rt2x00pci_register_read(rt2x00dev, CSR14, &reg);

		rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);

		rt2x00_set_field32(&reg, CSR14_TSF_SYNC, conf->sync);

		rt2x00_set_field32(&reg, CSR14_TBCN, 1);

		rt2x00pci_register_write(rt2x00dev, CSR14, reg);

	}

drivers/net/wireless/rt2x00/rt2500usb.c

+2 −0
Original line number Diff line number Diff line
@@ -343,7 +343,9 @@ static void rt2500usb_config_intf(struct rt2x00_dev *rt2x00dev, 
		rt2500usb_register_write(rt2x00dev, TXRX_CSR18, reg);



		rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg);

		rt2x00_set_field16(&reg, TXRX_CSR19_TSF_COUNT, 1);

		rt2x00_set_field16(&reg, TXRX_CSR19_TSF_SYNC, conf->sync);

		rt2x00_set_field16(&reg, TXRX_CSR19_TBCN, 1);

		rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);

	}

drivers/net/wireless/rt2x00/rt61pci.c

+2 −0
Original line number Diff line number Diff line
@@ -343,7 +343,9 @@ static void rt61pci_config_intf(struct rt2x00_dev *rt2x00dev, 
		 * Enable synchronisation.

		 */

		rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);

		rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);

		rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, conf->sync);

		rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 1);

		rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);

	}

drivers/net/wireless/rt2x00/rt73usb.c

+2 −0
Original line number Diff line number Diff line
@@ -355,7 +355,9 @@ static void rt73usb_config_intf(struct rt2x00_dev *rt2x00dev, 
		 * Enable synchronisation.

		 */

		rt73usb_register_read(rt2x00dev, TXRX_CSR9, &reg);

		rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);

		rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, conf->sync);

		rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 1);

		rt73usb_register_write(rt2x00dev, TXRX_CSR9, reg);

	}