Commit 41d2f291 authored by John W. Linville's avatar John W. Linville

iwlagn: default to MAX_UCODE_BEACON_INTERVAL in iwl_adjust_beacon_interval

Default to MAX_UCODE_BEACON_INTERVAL if the output of
iwl_adjust_beacon_interval would otherwise be zero.  This prevents a
division by zero on my iwl5300-equipped Lenovo T400 with kernels that
include "mac80211: use cfg80211s BSS infrastructure".

This patch is a bit of a hack -- I'm not sure why iwl_setup_rxon_timing
is giving iwl_adjust_beacon_interval a zero input (which is the only way
it would output zero).  I would be happy to have a better fix.  But for
now, this makes my box boot...
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c493b017
No related merge requests found
...@@ -644,6 +644,9 @@ static u16 iwl_adjust_beacon_interval(u16 beacon_val) ...@@ -644,6 +644,9 @@ static u16 iwl_adjust_beacon_interval(u16 beacon_val)
/ MAX_UCODE_BEACON_INTERVAL; / MAX_UCODE_BEACON_INTERVAL;
new_val = beacon_val / beacon_factor; new_val = beacon_val / beacon_factor;
if (!new_val)
new_val = MAX_UCODE_BEACON_INTERVAL;
return new_val; return new_val;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment