Skip to content

Commit

Permalink
mac80211: Cancel the power save timer in ieee80211_stop.
Browse files Browse the repository at this point in the history
Since the station info is flushed before calling set_disassoc
in ieee80211_stop, the power save timer is never cancelled
when the driver is unloaded. Hence the timer cancellation has
to be done in ieee80211_stop itself.

Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Vivek Natarajan authored and John W. Linville committed Jan 29, 2009
1 parent a97b77b commit 7cbf0ba
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions net/mac80211/iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,8 @@ static int ieee80211_stop(struct net_device *dev)
atomic_dec(&local->iff_promiscs);

dev_mc_unsync(local->mdev, dev);
del_timer_sync(&local->dynamic_ps_timer);
cancel_work_sync(&local->dynamic_ps_enable_work);

/* APs need special treatment */
if (sdata->vif.type == NL80211_IFTYPE_AP) {
Expand Down

0 comments on commit 7cbf0ba

Please sign in to comment.