---

yaml --- r: 361797 b: refs/heads/master c: 4c6e2fd h: refs/heads/master i: 361795: 7a75cb3 v: v3
git-mirror · Mar 20, 2013 · 9d54f99 · 9d54f99
1 parent 9c5f0ee
commit 9d54f99
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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);