From: Helmut Schaa Date: Sun, 11 Jul 2010 10:29:49 +0000 (+0200) Subject: rt2x00: Don't initialize beacon interval to 0 on rt2800 devices X-Git-Tag: v2.6.36-rc1~571^2~107^2~54 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8544df327c4c1c2bc6f2f6bf2997980d0d9a29f0;p=~emulex%2Finfiniband.git 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 Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 64bfa6e6a4e..cfe199bb36a 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);