diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-08-23 15:07:36 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-08-23 15:07:36 +0530 |
| commit | ce078e4f80e0d82730d42be0ee44b9e6e1dd3866 (patch) | |
| tree | 1c979b4d93de957a2cb7bb1e4a8068b62b02b663 /net/mac80211 | |
| parent | 929b4be511e72a31d4ca9447a12dcc672d544f25 (diff) | |
| parent | 196ad09b956e63131e3d196e490a4dfbb85e875f (diff) | |
Merge commit 'v3.4.9' into android-t114-3.4
Linux v3.4.9
Conflicts:
arch/arm/kernel/smp.c
arch/arm/vfp/entry.S
Change-Id: I731e815ed35ba9280374a5a3e5a6a8b6b805d695
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mesh.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index e5fbb7cf3562..e80fa33b504d 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -595,6 +595,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.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 |