diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 18:50:13 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 18:50:13 -0400 |
| commit | f39848f72c4422f44597d1a2e0caed94a5c49d52 (patch) | |
| tree | 67eb08a3512843eb15c8502c12f146673ff9631b | |
| parent | 378566b9488564f69aca363a15d1a6f7bc8f6ccd (diff) | |
| download | longterm-queue-4.12-f39848f72c4422f44597d1a2e0caed94a5c49d52.tar.gz | |
l2tp: context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/l2tp-cleanup-l2tp_tunnel_delete-calls.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/queue/l2tp-cleanup-l2tp_tunnel_delete-calls.patch b/queue/l2tp-cleanup-l2tp_tunnel_delete-calls.patch index decd017..9c808aa 100644 --- a/queue/l2tp-cleanup-l2tp_tunnel_delete-calls.patch +++ b/queue/l2tp-cleanup-l2tp_tunnel_delete-calls.patch @@ -1,4 +1,4 @@ -From 4dc12ffeaeac939097a3f55c881d3dc3523dff0c Mon Sep 17 00:00:00 2001 +From aa7dfc2af0d45cb8a38f220246e4a74ae479b07b Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jslaby@suse.cz> Date: Wed, 25 Oct 2017 15:57:55 +0200 Subject: [PATCH] l2tp: cleanup l2tp_tunnel_delete calls @@ -19,12 +19,13 @@ Cc: David S. Miller <davem@davemloft.net> Cc: netdev@vger.kernel.org Acked-by: Guillaume Nault <g.nault@alphalink.fr> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c -index 02d61101b108..af22aa8ae35b 100644 +index 417226250da2..f4a0c2b0f4ff 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c -@@ -1891,7 +1891,7 @@ static __net_exit void l2tp_exit_net(struct net *net) +@@ -1896,7 +1896,7 @@ static __net_exit void l2tp_exit_net(struct net *net) rcu_read_lock_bh(); list_for_each_entry_rcu(tunnel, &pn->l2tp_tunnel_list, list) { @@ -34,18 +35,18 @@ index 02d61101b108..af22aa8ae35b 100644 rcu_read_unlock_bh(); diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c -index f5179424eaf1..f04fb347d251 100644 +index 12cfcd0ca807..bcddeac0cb18 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c -@@ -282,7 +282,7 @@ static int l2tp_nl_cmd_tunnel_delete(struct sk_buff *skb, struct genl_info *info +@@ -280,7 +280,7 @@ static int l2tp_nl_cmd_tunnel_delete(struct sk_buff *skb, struct genl_info *info l2tp_tunnel_notify(&l2tp_nl_family, info, tunnel, L2TP_CMD_TUNNEL_DELETE); - (void) l2tp_tunnel_delete(tunnel); + l2tp_tunnel_delete(tunnel); - l2tp_tunnel_dec_refcount(tunnel); - + out: + return ret; -- 2.15.0 |