diff options
| author |   Helmut Schaa <helmut.schaa@googlemail.com> | 2010-07-11 12:29:49 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-07-12 16:05:35 -0400 |
| commit | 8544df327c4c1c2bc6f2f6bf2997980d0d9a29f0 (patch) | |
| tree | 627219c86ebc2685a6e64008a0114d94b63ef18a /drivers/net | |
| parent | rt2x00: Remove set_tim callback from PCI drivers (diff) | |
| download | linux-dev-8544df327c4c1c2bc6f2f6bf2997980d0d9a29f0.tar.xz linux-dev-8544df327c4c1c2bc6f2f6bf2997980d0d9a29f0.zip | |
rt2x00: Don't initialize beacon interval to 0 on rt2800 devices
Activating the TBTT interrupt when a beacon interval of 0 is configured
results in an interrupt storm causing the machine to hang. Hence,
initialize the beacon interval to a reasonable default of 100TUs.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 64bfa6e6a4e5..cfe199bb36a3 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -1419,7 +1419,7 @@ int rt2800_init_registers(struct rt2x00_dev *rt2x00dev) rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, 0x00000000); rt2800_register_read(rt2x00dev, BCN_TIME_CFG, ®); - rt2x00_set_field32(®, BCN_TIME_CFG_BEACON_INTERVAL, 0); + rt2x00_set_field32(®, BCN_TIME_CFG_BEACON_INTERVAL, 1600); rt2x00_set_field32(®, BCN_TIME_CFG_TSF_TICKING, 0); rt2x00_set_field32(®, BCN_TIME_CFG_TSF_SYNC, 0); rt2x00_set_field32(®, BCN_TIME_CFG_TBTT_ENABLE, 0); |