On Tue, Dec 4, 2012 at 8:12 PM, Marco Porsch <marco.porsch@xxxxxxxxxxxxxxxxxxx> wrote: > If the beacon is already enabled, do not modify the beacon timer. This causes > a hard TBTT adjustment and may cause mischief for powersave or synchronization.j It might be clearer if you explain this patch actually defers "TBTT" adjustment until the next beacon. > Signed-off-by: Marco Porsch <marco.porsch@xxxxxxxxxxxxxxxxxxx> > --- > drivers/net/wireless/mac80211_hwsim.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c > index bc763d2..abfa7e6 100644 > --- a/drivers/net/wireless/mac80211_hwsim.c > +++ b/drivers/net/wireless/mac80211_hwsim.c > @@ -1174,7 +1174,7 @@ static int mac80211_hwsim_config(struct ieee80211_hw *hw, u32 changed) > data->power_level = conf->power_level; > if (!data->started || !data->beacon_int) > del_timer(&data->beacon_timer); > - else > + else if (!timer_pending(&data->beacon_timer)) > mod_timer(&data->beacon_timer, jiffies + data->beacon_int); There is an immediate beacon timer adjustment in mac80211_hwsim_bss_info_changed() as well. Thomas -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html