linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mac80211: Cancel the dynamic ps timer in ioctl_siwpower.
@ 2009-01-27 13:56 Vivek Natarajan
  2009-01-29 19:46 ` Kalle Valo
  0 siblings, 1 reply; 3+ messages in thread
From: Vivek Natarajan @ 2009-01-27 13:56 UTC (permalink / raw)
  To: linville; +Cc: linux-wireless

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>
---
 net/mac80211/wext.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 70a29b6..5c88b82 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -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);
 		}
 	}
 
-- 
1.6.0.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-01-29 20:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-27 13:56 [PATCH] mac80211: Cancel the dynamic ps timer in ioctl_siwpower Vivek Natarajan
2009-01-29 19:46 ` Kalle Valo
2009-01-29 19:47   ` John W. Linville

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).