From b132a319d2a39a62a33fe1e84fb71815973cf44f Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 2 Nov 2011 22:47:44 +0000
Subject: [PATCH] --- yaml --- r: 273519 b: refs/heads/master c:
 e2e210c0238eb7073e07af503ae743fa53977120 h: refs/heads/master i:   273517:
 14dd83d687ff76aa356c7215f4d2e1643d0c9464   273515:
 1ae0af78b4bf51c11b9f090983412bf42f6e3076   273511:
 d6e06364e3d492dc8d3c4bd286027a048be77721   273503:
 53deb993505ebb1bbc33a6beb8c1b0877900aa60 v: v3

---
 [refs]                     | 2 +-
 trunk/net/l2tp/l2tp_core.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 76d6eba2120a..737991e569af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2edcd4ca43df3c1d1d392753531cc73a53e709ba
+refs/heads/master: e2e210c0238eb7073e07af503ae743fa53977120
diff --git a/trunk/net/l2tp/l2tp_core.c b/trunk/net/l2tp/l2tp_core.c
index 34b2ddeacb67..bf8d50c67931 100644
--- a/trunk/net/l2tp/l2tp_core.c
+++ b/trunk/net/l2tp/l2tp_core.c
@@ -397,6 +397,7 @@ static void l2tp_recv_dequeue(struct l2tp_session *session)
 	 * expect to send up next, dequeue it and any other
 	 * in-sequence packets behind it.
 	 */
+start:
 	spin_lock_bh(&session->reorder_q.lock);
 	skb_queue_walk_safe(&session->reorder_q, skb, tmp) {
 		if (time_after(jiffies, L2TP_SKB_CB(skb)->expires)) {
@@ -433,7 +434,7 @@ static void l2tp_recv_dequeue(struct l2tp_session *session)
 		 */
 		spin_unlock_bh(&session->reorder_q.lock);
 		l2tp_recv_dequeue_skb(session, skb);
-		spin_lock_bh(&session->reorder_q.lock);
+		goto start;
 	}
 
 out: