lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

l2tp: purge session reorder queue on delete

Browse Source 
Add calls to l2tp_session_queue_purge as a part of l2tp_tunnel_closeall
and l2tp_session_delete.  Pseudowire implementations which are deleted only
via. l2tp_core l2tp_session_delete calls can dispense with their own code for
flushing the reorder queue.

Signed-off-by: Tom Parkin <tparkin@katalix.com>
Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tom Parkin
2013-03-19 06:11:20 +00:00
committed by David S. Miller
parent 48f72f92b3
commit 4c6e2fd354
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/l2tp/l2tp_core.c
View File

@@ -1373,6 +1373,8 @@ again:
synchronize_rcu(); synchronize_rcu();
} }
l2tp_session_queue_purge(session);
if (session->session_close != NULL) if (session->session_close != NULL)
(*session->session_close)(session); (*session->session_close)(session);
@@ -1813,6 +1815,8 @@ EXPORT_SYMBOL_GPL(l2tp_session_free);
*/ */
int l2tp_session_delete(struct l2tp_session *session) int l2tp_session_delete(struct l2tp_session *session)
{ {
l2tp_session_queue_purge(session);
if (session->session_close != NULL) if (session->session_close != NULL)
(*session->session_close)(session); (*session->session_close)(session);