git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fib_trie: Fix /proc/net/fib_trie when CONFIG_IP_MULTIPLE_TABLES is not defined
[pandora-kernel.git]
/
net
/
mac80211
/
mesh.c
diff --git
a/net/mac80211/mesh.c
b/net/mac80211/mesh.c
index
a7078fd
..
f85de8e
100644
(file)
--- a/
net/mac80211/mesh.c
+++ b/
net/mac80211/mesh.c
@@
-543,6
+543,7
@@
void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
del_timer_sync(&sdata->u.mesh.housekeeping_timer);
del_timer_sync(&sdata->u.mesh.mesh_path_root_timer);
del_timer_sync(&sdata->u.mesh.housekeeping_timer);
del_timer_sync(&sdata->u.mesh.mesh_path_root_timer);
+ del_timer_sync(&sdata->u.mesh.mesh_path_timer);
/*
* If the timer fired while we waited for it, it will have
* requeued the work. Now the work will be running again
/*
* If the timer fired while we waited for it, it will have
* requeued the work. Now the work will be running again