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);