4.9-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Jiri Slaby <jsl...@suse.cz>


[ Upstream commit 4dc12ffeaeac939097a3f55c881d3dc3523dff0c ]

l2tp_tunnel_delete does not return anything since commit 62b982eeb458
("l2tp: fix race condition in l2tp_tunnel_delete").  But call sites of
l2tp_tunnel_delete still do casts to void to avoid unused return value
warnings.

Kill these now useless casts.

Signed-off-by: Jiri Slaby <jsl...@suse.cz>
Cc: Sabrina Dubroca <s...@queasysnail.net>
Cc: Guillaume Nault <g.na...@alphalink.fr>
Cc: David S. Miller <da...@davemloft.net>
Cc: netdev@vger.kernel.org
Acked-by: Guillaume Nault <g.na...@alphalink.fr>
Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Sasha Levin <alexander.le...@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 net/l2tp/l2tp_core.c    |    2 +-
 net/l2tp/l2tp_netlink.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -1944,7 +1944,7 @@ static __net_exit void l2tp_exit_net(str
 
        rcu_read_lock_bh();
        list_for_each_entry_rcu(tunnel, &pn->l2tp_tunnel_list, list) {
-               (void)l2tp_tunnel_delete(tunnel);
+               l2tp_tunnel_delete(tunnel);
        }
        rcu_read_unlock_bh();
 
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
@@ -287,7 +287,7 @@ static int l2tp_nl_cmd_tunnel_delete(str
        l2tp_tunnel_notify(&l2tp_nl_family, info,
                           tunnel, L2TP_CMD_TUNNEL_DELETE);
 
-       (void) l2tp_tunnel_delete(tunnel);
+       l2tp_tunnel_delete(tunnel);
 
 out:
        return ret;


Reply via email to