From: Greg Kroah-Hartman Date: Thu, 9 Aug 2012 18:24:51 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.5.2~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=507c2f184670f76bdb8910dfdf4f75edc3d1e459;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: mac80211-cancel-mesh-path-timer.patch --- diff --git a/queue-3.0/mac80211-cancel-mesh-path-timer.patch b/queue-3.0/mac80211-cancel-mesh-path-timer.patch new file mode 100644 index 00000000000..cdf046464bb --- /dev/null +++ b/queue-3.0/mac80211-cancel-mesh-path-timer.patch @@ -0,0 +1,30 @@ +From dd4c9260e7f23f2e951cbfb2726e468c6d30306c Mon Sep 17 00:00:00 2001 +From: Johannes Berg +Date: Wed, 1 Aug 2012 21:03:21 +0200 +Subject: mac80211: cancel mesh path timer + +From: Johannes Berg + +commit dd4c9260e7f23f2e951cbfb2726e468c6d30306c upstream. + +The mesh path timer needs to be canceled when +leaving the mesh as otherwise it could fire +after the interface has been removed already. + +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman + +--- + net/mac80211/mesh.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/net/mac80211/mesh.c ++++ b/net/mac80211/mesh.c +@@ -490,6 +490,7 @@ void ieee80211_stop_mesh(struct ieee8021 + + 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 diff --git a/queue-3.0/series b/queue-3.0/series index 2bce279a844..3f7617e2c42 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -9,3 +9,4 @@ arm-7478-1-errata-extend-workaround-for-erratum-720789.patch arm-7479-1-mm-avoid-null-dereference-when-flushing-gate_vma-with-vivt-caches.patch alsa-hda-remove-quirk-for-dell-vostro-1015.patch mm-mmu_notifier-fix-freed-page-still-mapped-in-secondary-mmu.patch +mac80211-cancel-mesh-path-timer.patch