From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Chapman Subject: [PATCH net-next v3 16/16] l2tp: make __l2tp_session_unhash internal Date: Mon, 12 Feb 2018 17:33:39 +0000 Message-ID: <1518456819-22244-17-git-send-email-jchapman@katalix.com> References: <1518456819-22244-1-git-send-email-jchapman@katalix.com> To: netdev@vger.kernel.org Return-path: Received: from mail.katalix.com ([82.103.140.233]:38750 "EHLO mail.katalix.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932145AbeBLRdr (ORCPT ); Mon, 12 Feb 2018 12:33:47 -0500 Received: from katalix.com (82-69-108-24.dsl.in-addr.zen.co.uk [82.69.108.24]) (Authenticated sender: james) by mail.katalix.com (Postfix) with ESMTPSA id 0A0FA84674 for ; Mon, 12 Feb 2018 17:33:45 +0000 (GMT) In-Reply-To: <1518456819-22244-1-git-send-email-jchapman@katalix.com> Sender: netdev-owner@vger.kernel.org List-ID: __l2tp_session_unhash is now only used internally so there is no reason to expose it to other l2tp modules. Rename it l2tp_session_unhash while we're at it. Signed-off-by: James Chapman --- net/l2tp/l2tp_core.c | 5 ++--- net/l2tp/l2tp_core.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 28940cf9cc76..34221c6763d8 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -1642,7 +1642,7 @@ void l2tp_session_free(struct l2tp_session *session) * shutdown via. l2tp_session_delete and a pseudowire-specific session_close * callback. */ -void __l2tp_session_unhash(struct l2tp_session *session) +static void l2tp_session_unhash(struct l2tp_session *session) { struct l2tp_tunnel *tunnel = session->tunnel; @@ -1663,7 +1663,6 @@ void __l2tp_session_unhash(struct l2tp_session *session) } } } -EXPORT_SYMBOL_GPL(__l2tp_session_unhash); /* Workqueue session deletion function */ static void l2tp_session_del_work(struct work_struct *work) @@ -1674,7 +1673,7 @@ static void l2tp_session_del_work(struct work_struct *work) l2tp_info(session, L2TP_MSG_CONTROL, "%s: closing session\n", session->name); - __l2tp_session_unhash(session); + l2tp_session_unhash(session); l2tp_session_queue_purge(session); if (session->session_close) (*session->session_close)(session); diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h index 73c4ce79c708..faca18046518 100644 --- a/net/l2tp/l2tp_core.h +++ b/net/l2tp/l2tp_core.h @@ -239,7 +239,6 @@ struct l2tp_session *l2tp_session_create(int priv_size, int l2tp_session_register(struct l2tp_session *session, struct l2tp_tunnel *tunnel); -void __l2tp_session_unhash(struct l2tp_session *session); int l2tp_session_delete(struct l2tp_session *session); void l2tp_session_free(struct l2tp_session *session); void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb, -- 1.9.1