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>
This commit is contained in:
committed by
John W. Linville
parent
94ff91d4af
commit
b8abde45d7
@@ -906,6 +906,8 @@ static int ieee80211_ioctl_siwpower(struct net_device *dev,
|
|||||||
IEEE80211_CONF_CHANGE_PS);
|
IEEE80211_CONF_CHANGE_PS);
|
||||||
if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK)
|
if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK)
|
||||||
ieee80211_send_nullfunc(local, sdata, 0);
|
ieee80211_send_nullfunc(local, sdata, 0);
|
||||||
|
del_timer_sync(&local->dynamic_ps_timer);
|
||||||
|
cancel_work_sync(&local->dynamic_ps_enable_work);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user