Commit b8abde45 authored Jan 27, 2009 by Vivek Natarajan Committed by John W. Linville Jan 30, 2009

mac80211: Cancel the dynamic ps timer in ioctl_siwpower.



If the dynamic power save timer has been started before the power save
is disabled using iwconfig, we fail to cancel the timer. Hence cancel it
while disabling power save.

Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 94ff91d4

net/mac80211/wext.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -906,6 +906,8 @@ static int ieee80211_ioctl_siwpower(struct net_device *dev,
		IEEE80211_CONF_CHANGE_PS);
		if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK)
		ieee80211_send_nullfunc(local, sdata, 0);
		del_timer_sync(&local->dynamic_ps_timer);
		cancel_work_sync(&local->dynamic_ps_enable_work);
		}
		}