[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1518188432-9245-17-git-send-email-jchapman@katalix.com>
Date: Fri, 9 Feb 2018 15:00:32 +0000
From: James Chapman <jchapman@...alix.com>
To: netdev@...r.kernel.org
Subject: [PATCH net-next 16/16] l2tp: make __l2tp_session_unhash internal
__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 <jchapman@...alix.com>
---
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
Powered by blists - more mailing lists