aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2500pci.c
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-01-06 17:38:58 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:09:23 -0500
commit3867705bb773818b39e0ca8d02ccb71fb4d2ffb8 (patch)
tree87c320f5f062125d5bea56e2148c9c74ec175383 /drivers/net/wireless/rt2x00/rt2500pci.c
parent1230cb83f46731ca4eaa57c480788ed3c9d05935 (diff)
rt2x00: Only set the TBCN flag when the interface is configured to send beacons.
These flags used to be fixed to one in rt2500pci_config_type, which caused the beacon timer interrupt to fire. This would lead to rt2x00lib_beacondone adding work which called rt2x00lib_beacondone_scheduled which called ieee80211_beacon_get which printed an error about not having any beacon data. With this patch, these interrupts are only generated when the interface is configured to send beacons. Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl> Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500pci.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2500pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index a6234547261e..8b2f54b2e631 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -284,7 +284,7 @@ static void rt2500pci_config_type(struct rt2x00_dev *rt2x00dev, const int type,
284 */ 284 */
285 rt2x00pci_register_read(rt2x00dev, CSR14, &reg); 285 rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
286 rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1); 286 rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
287 rt2x00_set_field32(&reg, CSR14_TBCN, 1); 287 rt2x00_set_field32(&reg, CSR14_TBCN, (tsf_sync == TSF_SYNC_BEACON));
288 rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0); 288 rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
289 rt2x00_set_field32(&reg, CSR14_TSF_SYNC, tsf_sync); 289 rt2x00_set_field32(&reg, CSR14_TSF_SYNC, tsf_sync);
290 rt2x00pci_register_write(rt2x00dev, CSR14, reg); 290 rt2x00pci_register_write(rt2x00dev, CSR14, reg);