diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-11-01 13:36:34 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-11-01 13:36:34 -0700 |
| commit | 925d49abc38dcc7ef1cbfe125c6f0b2202ae3df3 (patch) | |
| tree | a56506710f0340db055191e3cf0a207699c1b849 /net/mac80211/mesh.c | |
| parent | 834029ac9d0ad8dea4e6a21bc34877dc3740b9f4 (diff) | |
| parent | 27d0858dbcf199838b8c50a3e94d397bf326d986 (diff) | |
| download | kernel_samsung_tuna-925d49abc38dcc7ef1cbfe125c6f0b2202ae3df3.zip kernel_samsung_tuna-925d49abc38dcc7ef1cbfe125c6f0b2202ae3df3.tar.gz kernel_samsung_tuna-925d49abc38dcc7ef1cbfe125c6f0b2202ae3df3.tar.bz2 | |
Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0
Change-Id: I9685feb9277b450da10d78a455b3c0674d6cfe18
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Diffstat (limited to 'net/mac80211/mesh.c')
| -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 29e9980..370aa94 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -490,6 +490,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 |