From: Vivek Natarajan <vivek.natraj@gmail.com>
Date: Tue, 27 Jan 2009 13:56:28 +0000 (+0530)
Subject: mac80211: Cancel the dynamic ps timer in ioctl_siwpower.
X-Git-Tag: v2.6.30-rc1~662^2~836^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b8abde45d7d6ab9e8ceced9b5990eeb1149d0b97;p=karo-tx-linux.git

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>
---

diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 70a29b657b61..5c88b8246bbb 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);
 		}
 	}