From 9d54f99b43c7bb40af318f069706a8f558f763ca Mon Sep 17 00:00:00 2001
From: Tom Parkin <tparkin@katalix.com>
Date: Tue, 19 Mar 2013 06:11:20 +0000
Subject: [PATCH] --- yaml --- r: 361797 b: refs/heads/master c:
 4c6e2fd35460208596fa099ee0750a4b0438aa5c h: refs/heads/master i:   361795:
 7a75cb30a4528bda5d9b87ae8fd2bb3c2452d766 v: v3

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

diff --git a/[refs] b/[refs]
index 9b9e7e78a40c..13140f7f9021 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48f72f92b31431c40279b0fba6c5588e07e67d95
+refs/heads/master: 4c6e2fd35460208596fa099ee0750a4b0438aa5c
diff --git a/trunk/net/l2tp/l2tp_core.c b/trunk/net/l2tp/l2tp_core.c
index 69c316dd02dc..c00f31b8cc04 100644
--- a/trunk/net/l2tp/l2tp_core.c
+++ b/trunk/net/l2tp/l2tp_core.c
@@ -1373,6 +1373,8 @@ void l2tp_tunnel_closeall(struct l2tp_tunnel *tunnel)
 				synchronize_rcu();
 			}
 
+			l2tp_session_queue_purge(session);
+
 			if (session->session_close != NULL)
 				(*session->session_close)(session);
 
@@ -1813,6 +1815,8 @@ EXPORT_SYMBOL_GPL(l2tp_session_free);
  */
 int l2tp_session_delete(struct l2tp_session *session)
 {
+	l2tp_session_queue_purge(session);
+
 	if (session->session_close != NULL)
 		(*session->session_close)(session);