Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 526f1cfb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'l2tp-drop-l2tp_session_find' 



Guillaume Nault says:

====================
l2tp: drop l2tp_session_find()

l2tp_netlink is the last user of l2tp_session_find(), but that call is
useless. Let's remove it and drop l2tp_session_find() definitely.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 93411c27 55a3ce3b

net/l2tp/l2tp_core.c

+1 −50
Original line number Diff line number Diff line
@@ -217,27 +217,6 @@ static void l2tp_tunnel_sock_put(struct sock *sk) 
	sock_put(sk);

}



/* Lookup a session by id in the global session list

 */

static struct l2tp_session *l2tp_session_find_2(struct net *net, u32 session_id)

{

	struct l2tp_net *pn = l2tp_pernet(net);

	struct hlist_head *session_list =

		l2tp_session_id_hash_2(pn, session_id);

	struct l2tp_session *session;



	rcu_read_lock_bh();

	hlist_for_each_entry_rcu(session, session_list, global_hlist) {

		if (session->session_id == session_id) {

			rcu_read_unlock_bh();

			return session;

		}

	}

	rcu_read_unlock_bh();



	return NULL;

}



/* Session hash list.

 * The session_id SHOULD be random according to RFC2661, but several

 * L2TP implementations (Cisco and Microsoft) use incrementing
@@ -250,35 +229,7 @@ l2tp_session_id_hash(struct l2tp_tunnel *tunnel, u32 session_id) 
	return &tunnel->session_hlist[hash_32(session_id, L2TP_HASH_BITS)];

}



/* Lookup a session by id

 */

struct l2tp_session *l2tp_session_find(struct net *net, struct l2tp_tunnel *tunnel, u32 session_id)

{

	struct hlist_head *session_list;

	struct l2tp_session *session;



	/* In L2TPv3, session_ids are unique over all tunnels and we

	 * sometimes need to look them up before we know the

	 * tunnel.

	 */

	if (tunnel == NULL)

		return l2tp_session_find_2(net, session_id);



	session_list = l2tp_session_id_hash(tunnel, session_id);

	read_lock_bh(&tunnel->hlist_lock);

	hlist_for_each_entry(session, session_list, hlist) {

		if (session->session_id == session_id) {

			read_unlock_bh(&tunnel->hlist_lock);

			return session;

		}

	}

	read_unlock_bh(&tunnel->hlist_lock);



	return NULL;

}

EXPORT_SYMBOL_GPL(l2tp_session_find);



/* Like l2tp_session_find() but takes a reference on the returned session.

/* Lookup a session. A new reference is held on the returned session.

 * Optionally calls session->ref() too if do_ref is true.

 */

struct l2tp_session *l2tp_session_get(struct net *net,

net/l2tp/l2tp_core.h

+0 −3
Original line number Diff line number Diff line
@@ -233,9 +233,6 @@ static inline struct l2tp_tunnel *l2tp_sock_to_tunnel(struct sock *sk) 
struct l2tp_session *l2tp_session_get(struct net *net,

				      struct l2tp_tunnel *tunnel,

				      u32 session_id, bool do_ref);

struct l2tp_session *l2tp_session_find(struct net *net,

				       struct l2tp_tunnel *tunnel,

				       u32 session_id);

struct l2tp_session *l2tp_session_get_nth(struct l2tp_tunnel *tunnel, int nth,

					  bool do_ref);

struct l2tp_session *l2tp_session_get_by_ifname(struct net *net, char *ifname,

net/l2tp/l2tp_netlink.c

+0 −5
Original line number Diff line number Diff line
@@ -521,11 +521,6 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf 
		goto out;

	}

	session_id = nla_get_u32(info->attrs[L2TP_ATTR_SESSION_ID]);

	session = l2tp_session_find(net, tunnel, session_id);

	if (session) {

		ret = -EEXIST;

		goto out;

	}



	if (!info->attrs[L2TP_ATTR_PEER_SESSION_ID]) {

		ret = -EINVAL;