From 34f997f8d0b49d44c362ffec746c3a71e52f324d Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Thu, 11 Apr 2013 13:47:15 +0000
Subject: [PATCH] --- yaml --- r: 362575 b: refs/heads/master c:
 fb745e9a037895321781d066aa24757ceabf9df9 h: refs/heads/master i:   362573:
 cdbe2a5522b1dd82ccad9e3a76cd1da4c72cb2d9   362571:
 dd443e339235ed1141ec7bbe9a4444c426689404   362567:
 efbb641af11ce779837fe01d1eacacee7474d177   362559:
 38ef137b8f6497f3ff6b237c20024f38e51b9252 v: v3

---
 [refs]              | 2 +-
 trunk/net/802/mrp.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5dab8265eab0..79129fe27b71 100644
--- 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
index a4cc3229952a..e085bcc754f6 100644
--- 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);