diff options
| author | Vivek Natarajan <vivek.natraj@gmail.com> | 2009-01-27 19:26:28 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-01-30 13:38:28 -0500 |
| commit | b8abde45d7d6ab9e8ceced9b5990eeb1149d0b97 (patch) | |
| tree | 290530b650cdbc9378a3f2f43907cdb08c4a3b88 /net | |
| parent | 94ff91d4afd8ae14e8bb7012ba17cf6984130e44 (diff) | |
| download | kernel-crypto-b8abde45d7d6ab9e8ceced9b5990eeb1149d0b97.tar.gz kernel-crypto-b8abde45d7d6ab9e8ceced9b5990eeb1149d0b97.tar.xz kernel-crypto-b8abde45d7d6ab9e8ceced9b5990eeb1149d0b97.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | 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 70a29b657b6..5c88b8246bb 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); } } |