aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-03-09 17:47:43 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-03-13 19:31:41 -0400
commitfd3c91c5e57eef8db71cf52e2473832c330bf5db (patch)
treeed1db81a356d81cbfbf19811856b34ad9f04fdba /drivers
parent72fa559bf44aab30ac5fc8317472ef3441f4aa64 (diff)
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: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/rt2x00/rt2400pci.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2500pci.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2500usb.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt61pci.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt73usb.c2
5 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 70f711e86362..e2bb63496dbc 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -291,7 +291,9 @@ static void rt2400pci_config_intf(struct rt2x00_dev *rt2x00dev,
291 * Enable synchronisation. 291 * Enable synchronisation.
292 */ 292 */
293 rt2x00pci_register_read(rt2x00dev, CSR14, &reg); 293 rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
294 rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
294 rt2x00_set_field32(&reg, CSR14_TSF_SYNC, conf->sync); 295 rt2x00_set_field32(&reg, CSR14_TSF_SYNC, conf->sync);
296 rt2x00_set_field32(&reg, CSR14_TBCN, 1);
295 rt2x00pci_register_write(rt2x00dev, CSR14, reg); 297 rt2x00pci_register_write(rt2x00dev, CSR14, reg);
296 } 298 }
297 299
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index a46206c69760..4e312cb0ff0b 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -294,7 +294,9 @@ static void rt2500pci_config_intf(struct rt2x00_dev *rt2x00dev,
294 * Enable synchronisation. 294 * Enable synchronisation.
295 */ 295 */
296 rt2x00pci_register_read(rt2x00dev, CSR14, &reg); 296 rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
297 rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
297 rt2x00_set_field32(&reg, CSR14_TSF_SYNC, conf->sync); 298 rt2x00_set_field32(&reg, CSR14_TSF_SYNC, conf->sync);
299 rt2x00_set_field32(&reg, CSR14_TBCN, 1);
298 rt2x00pci_register_write(rt2x00dev, CSR14, reg); 300 rt2x00pci_register_write(rt2x00dev, CSR14, reg);
299 } 301 }
300 302
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 43da93a22e77..8dfebfd695de 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -343,7 +343,9 @@ static void rt2500usb_config_intf(struct rt2x00_dev *rt2x00dev,
343 rt2500usb_register_write(rt2x00dev, TXRX_CSR18, reg); 343 rt2500usb_register_write(rt2x00dev, TXRX_CSR18, reg);
344 344
345 rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg); 345 rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg);
346 rt2x00_set_field16(&reg, TXRX_CSR19_TSF_COUNT, 1);
346 rt2x00_set_field16(&reg, TXRX_CSR19_TSF_SYNC, conf->sync); 347 rt2x00_set_field16(&reg, TXRX_CSR19_TSF_SYNC, conf->sync);
348 rt2x00_set_field16(&reg, TXRX_CSR19_TBCN, 1);
347 rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg); 349 rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);
348 } 350 }
349 351
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 99f18d4ae855..914aee0ce8ce 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -343,7 +343,9 @@ static void rt61pci_config_intf(struct rt2x00_dev *rt2x00dev,
343 * Enable synchronisation. 343 * Enable synchronisation.
344 */ 344 */
345 rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg); 345 rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);
346 rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);
346 rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, conf->sync); 347 rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, conf->sync);
348 rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 1);
347 rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg); 349 rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
348 } 350 }
349 351
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index ddb59c037750..fc38c0c5cc3a 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -355,7 +355,9 @@ static void rt73usb_config_intf(struct rt2x00_dev *rt2x00dev,
355 * Enable synchronisation. 355 * Enable synchronisation.
356 */ 356 */
357 rt73usb_register_read(rt2x00dev, TXRX_CSR9, &reg); 357 rt73usb_register_read(rt2x00dev, TXRX_CSR9, &reg);
358 rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);
358 rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, conf->sync); 359 rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, conf->sync);
360 rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 1);
359 rt73usb_register_write(rt2x00dev, TXRX_CSR9, reg); 361 rt73usb_register_write(rt2x00dev, TXRX_CSR9, reg);
360 } 362 }
361 363