[rt2x00-users] [PATCH] rt2x00: Fix beacon de-synchronization while update beacon (all rt2x00 drivers)
Ivo van Doorn
ivdoorn at gmail.com
Sun Aug 9 22:57:26 UTC 2009
Hi,
> When beacon is being updated to refresh TIM (AP mode), beacon frames are
> de-synchronizing (i.e. two neighbor beacon frames - before and after
> update - are being transmitted with a wrong time interval).
> That is because xxx_write_beacon should disable beacon generation only
> while beacon data are being uploaded to the device, but it should not
> disable the beacon clock.
Applied to rt2x00.git.
Thanks,
Ivo
> Signed-off-by: Igor Perminov <igor.perminov at inbox.ru>
> ---
> drivers/net/wireless/rt2x00/rt2400pci.c | 2 --
> drivers/net/wireless/rt2x00/rt2500pci.c | 2 --
> drivers/net/wireless/rt2x00/rt2500usb.c | 15 ++++++++-------
> drivers/net/wireless/rt2x00/rt2800pci.c | 2 --
> drivers/net/wireless/rt2x00/rt2800usb.c | 2 --
> drivers/net/wireless/rt2x00/rt61pci.c | 2 --
> drivers/net/wireless/rt2x00/rt73usb.c | 2 --
> 7 files changed, 8 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
> index 30185ad..164df93 100644
> --- a/drivers/net/wireless/rt2x00/rt2400pci.c
> +++ b/drivers/net/wireless/rt2x00/rt2400pci.c
> @@ -1069,8 +1069,6 @@ static void rt2400pci_write_beacon(struct queue_entry *entry)
> * otherwise we might be sending out invalid data.
> */
> rt2x00pci_register_read(rt2x00dev, CSR14, ®);
> - rt2x00_set_field32(®, CSR14_TSF_COUNT, 0);
> - rt2x00_set_field32(®, CSR14_TBCN, 0);
> rt2x00_set_field32(®, CSR14_BEACON_GEN, 0);
> rt2x00pci_register_write(rt2x00dev, CSR14, reg);
>
> diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
> index 3b31715..4186582 100644
> --- a/drivers/net/wireless/rt2x00/rt2500pci.c
> +++ b/drivers/net/wireless/rt2x00/rt2500pci.c
> @@ -1227,8 +1227,6 @@ static void rt2500pci_write_beacon(struct queue_entry *entry)
> * otherwise we might be sending out invalid data.
> */
> rt2x00pci_register_read(rt2x00dev, CSR14, ®);
> - rt2x00_set_field32(®, CSR14_TSF_COUNT, 0);
> - rt2x00_set_field32(®, CSR14_TBCN, 0);
> rt2x00_set_field32(®, CSR14_BEACON_GEN, 0);
> rt2x00pci_register_write(rt2x00dev, CSR14, reg);
>
> diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
> index de48c5c..09a5894 100644
> --- a/drivers/net/wireless/rt2x00/rt2500usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2500usb.c
> @@ -1238,8 +1238,6 @@ static void rt2500usb_write_beacon(struct queue_entry *entry)
> * otherwise we might be sending out invalid data.
> */
> rt2500usb_register_read(rt2x00dev, TXRX_CSR19, ®);
> - rt2x00_set_field16(®, TXRX_CSR19_TSF_COUNT, 0);
> - rt2x00_set_field16(®, TXRX_CSR19_TBCN, 0);
> rt2x00_set_field16(®, TXRX_CSR19_BEACON_GEN, 0);
> rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);
>
> @@ -1287,7 +1285,7 @@ static int rt2500usb_get_tx_data_len(struct queue_entry *entry)
> static void rt2500usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
> const enum data_queue_qid queue)
> {
> - u16 reg;
> + u16 reg, reg0;
>
> if (queue != QID_BEACON) {
> rt2x00usb_kick_tx_queue(rt2x00dev, queue);
> @@ -1298,16 +1296,19 @@ static void rt2500usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
> if (!rt2x00_get_field16(reg, TXRX_CSR19_BEACON_GEN)) {
> rt2x00_set_field16(®, TXRX_CSR19_TSF_COUNT, 1);
> rt2x00_set_field16(®, TXRX_CSR19_TBCN, 1);
> + reg0 = reg;
> rt2x00_set_field16(®, TXRX_CSR19_BEACON_GEN, 1);
> /*
> * Beacon generation will fail initially.
> - * To prevent this we need to register the TXRX_CSR19
> - * register several times.
> + * To prevent this we need to change the TXRX_CSR19
> + * register several times (reg0 is the same as reg
> + * except for TXRX_CSR19_BEACON_GEN, which is 0 in reg0
> + * and 1 in reg).
> */
> rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);
> - rt2500usb_register_write(rt2x00dev, TXRX_CSR19, 0);
> + rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg0);
> rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);
> - rt2500usb_register_write(rt2x00dev, TXRX_CSR19, 0);
> + rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg0);
> rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);
> }
> }
> diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
> index e1639a2..df26b21 100644
> --- a/drivers/net/wireless/rt2x00/rt2800pci.c
> +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
> @@ -2209,8 +2209,6 @@ static void rt2800pci_write_beacon(struct queue_entry *entry)
> * otherwise we might be sending out invalid data.
> */
> rt2x00pci_register_read(rt2x00dev, BCN_TIME_CFG, ®);
> - rt2x00_set_field32(®, BCN_TIME_CFG_TSF_TICKING, 0);
> - rt2x00_set_field32(®, BCN_TIME_CFG_TBTT_ENABLE, 0);
> rt2x00_set_field32(®, BCN_TIME_CFG_BEACON_GEN, 0);
> rt2x00pci_register_write(rt2x00dev, BCN_TIME_CFG, reg);
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
> index 2de0389..3856f06 100644
> --- a/drivers/net/wireless/rt2x00/rt2800usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
> @@ -2050,8 +2050,6 @@ static void rt2800usb_write_beacon(struct queue_entry *entry)
> * otherwise we might be sending out invalid data.
> */
> rt2x00usb_register_read(rt2x00dev, BCN_TIME_CFG, ®);
> - rt2x00_set_field32(®, BCN_TIME_CFG_TSF_TICKING, 0);
> - rt2x00_set_field32(®, BCN_TIME_CFG_TBTT_ENABLE, 0);
> rt2x00_set_field32(®, BCN_TIME_CFG_BEACON_GEN, 0);
> rt2x00usb_register_write(rt2x00dev, BCN_TIME_CFG, reg);
>
> diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
> index 3447997..f4b4b86 100644
> --- a/drivers/net/wireless/rt2x00/rt61pci.c
> +++ b/drivers/net/wireless/rt2x00/rt61pci.c
> @@ -1855,8 +1855,6 @@ static void rt61pci_write_beacon(struct queue_entry *entry)
> * otherwise we might be sending out invalid data.
> */
> rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, ®);
> - rt2x00_set_field32(®, TXRX_CSR9_TSF_TICKING, 0);
> - rt2x00_set_field32(®, TXRX_CSR9_TBTT_ENABLE, 0);
> rt2x00_set_field32(®, TXRX_CSR9_BEACON_GEN, 0);
> rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
>
> diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
> index 4b9955b..4d94b65 100644
> --- a/drivers/net/wireless/rt2x00/rt73usb.c
> +++ b/drivers/net/wireless/rt2x00/rt73usb.c
> @@ -1527,8 +1527,6 @@ static void rt73usb_write_beacon(struct queue_entry *entry)
> * otherwise we might be sending out invalid data.
> */
> rt2x00usb_register_read(rt2x00dev, TXRX_CSR9, ®);
> - rt2x00_set_field32(®, TXRX_CSR9_TSF_TICKING, 0);
> - rt2x00_set_field32(®, TXRX_CSR9_TBTT_ENABLE, 0);
> rt2x00_set_field32(®, TXRX_CSR9_BEACON_GEN, 0);
> rt2x00usb_register_write(rt2x00dev, TXRX_CSR9, reg);
>
>
>
>
More information about the users
mailing list