From e38eaad42488c141e5606aaae03ae22305455fe7 Mon Sep 17 00:00:00 2001
From: Tom Parkin <tparkin@katalix.com>
Date: Tue, 19 Mar 2013 06:11:16 +0000
Subject: [PATCH] --- yaml --- r: 361793 b: refs/heads/master c:
 2b551c6e7d5bca2c78c216b15ef675653d4f459a h: refs/heads/master i:   361791:
 4441a326548deb484a5877adf930f3f4728405d2 v: v3

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

diff --git a/[refs] b/[refs]
index 32d9ca0b91d8..53f64a9a0211 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 936063175afd895913a5e9db77e1a0ef43ea44ea
+refs/heads/master: 2b551c6e7d5bca2c78c216b15ef675653d4f459a
diff --git a/trunk/net/l2tp/l2tp_core.c b/trunk/net/l2tp/l2tp_core.c
index 287e327342d1..0dd50c079f29 100644
--- a/trunk/net/l2tp/l2tp_core.c
+++ b/trunk/net/l2tp/l2tp_core.c
@@ -1737,6 +1737,7 @@ EXPORT_SYMBOL_GPL(l2tp_tunnel_create);
  */
 int l2tp_tunnel_delete(struct l2tp_tunnel *tunnel)
 {
+	l2tp_tunnel_closeall(tunnel);
 	return (false == queue_work(l2tp_wq, &tunnel->del_work));
 }
 EXPORT_SYMBOL_GPL(l2tp_tunnel_delete);