|
@@ -1317,6 +1317,9 @@ static void l2tp_tunnel_del_work(struct work_struct *work)
|
|
struct sock *sk = NULL;
|
|
struct sock *sk = NULL;
|
|
|
|
|
|
tunnel = container_of(work, struct l2tp_tunnel, del_work);
|
|
tunnel = container_of(work, struct l2tp_tunnel, del_work);
|
|
|
|
+
|
|
|
|
+ l2tp_tunnel_closeall(tunnel);
|
|
|
|
+
|
|
sk = l2tp_tunnel_sock_lookup(tunnel);
|
|
sk = l2tp_tunnel_sock_lookup(tunnel);
|
|
if (!sk)
|
|
if (!sk)
|
|
goto out;
|
|
goto out;
|
|
@@ -1639,7 +1642,6 @@ EXPORT_SYMBOL_GPL(l2tp_tunnel_create);
|
|
int l2tp_tunnel_delete(struct l2tp_tunnel *tunnel)
|
|
int l2tp_tunnel_delete(struct l2tp_tunnel *tunnel)
|
|
{
|
|
{
|
|
l2tp_tunnel_inc_refcount(tunnel);
|
|
l2tp_tunnel_inc_refcount(tunnel);
|
|
- l2tp_tunnel_closeall(tunnel);
|
|
|
|
if (false == queue_work(l2tp_wq, &tunnel->del_work)) {
|
|
if (false == queue_work(l2tp_wq, &tunnel->del_work)) {
|
|
l2tp_tunnel_dec_refcount(tunnel);
|
|
l2tp_tunnel_dec_refcount(tunnel);
|
|
return 1;
|
|
return 1;
|