---

yaml --- r: 362575 b: refs/heads/master c: fb745e9 h: refs/heads/master i: 362573: cdbe2a5 362571: dd443e3 362567: efbb641 362559: 38ef137 v: v3
git-mirror · Apr 12, 2013 · 34f997f · 34f997f
1 parent 3f9d57e
commit 34f997f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3be8fbab18fbc06b6ff94a56f9c225e29ea64a73
+refs/heads/master: fb745e9a037895321781d066aa24757ceabf9df9
diff --git a/trunk/net/802/mrp.c b/trunk/net/802/mrp.c
@@ -870,8 +870,12 @@ void mrp_uninit_applicant(struct net_device *dev, struct mrp_application *appl)
 	 * all pending messages before the applicant is gone.
 	 */
 	del_timer_sync(&app->join_timer);
+
+	spin_lock(&app->lock);
 	mrp_mad_event(app, MRP_EVENT_TX);
 	mrp_pdu_queue(app);
+	spin_unlock(&app->lock);
+
 	mrp_queue_xmit(app);
 
 	dev_mc_del(dev, appl->group_address);