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

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

Merge branch 'l2tp-const' 



Guillaume Nault says:

====================
l2tp: constify l2tp_session_get*() and l2tp_tunnel_find*()

Declare parameters of these functions as "const" where possible.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2a446c51 2f858b92

net/l2tp/l2tp_core.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -120,7 +120,7 @@ static inline struct l2tp_tunnel *l2tp_tunnel(struct sock *sk) 
	return sk->sk_user_data;

	return sk->sk_user_data;

}

}





static inline struct l2tp_net *l2tp_pernet(struct net *net)

static inline struct l2tp_net *l2tp_pernet(const struct net *net)

{

{

	BUG_ON(!net);

	BUG_ON(!net);
@@ -232,7 +232,7 @@ l2tp_session_id_hash(struct l2tp_tunnel *tunnel, u32 session_id) 
/* Lookup a session. A new reference is held 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.

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

 */

 */

struct l2tp_session *l2tp_session_get(struct net *net,

struct l2tp_session *l2tp_session_get(const struct net *net,

				      struct l2tp_tunnel *tunnel,

				      struct l2tp_tunnel *tunnel,

				      u32 session_id, bool do_ref)

				      u32 session_id, bool do_ref)

{

{
@@ -307,7 +307,8 @@ EXPORT_SYMBOL_GPL(l2tp_session_get_nth); 
/* Lookup a session by interface name.

/* Lookup a session by interface name.

 * This is very inefficient but is only used by management interfaces.

 * This is very inefficient but is only used by management interfaces.

 */

 */

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

struct l2tp_session *l2tp_session_get_by_ifname(const struct net *net,

						const char *ifname,

						bool do_ref)

						bool do_ref)

{

{

	struct l2tp_net *pn = l2tp_pernet(net);

	struct l2tp_net *pn = l2tp_pernet(net);
@@ -378,7 +379,7 @@ static int l2tp_session_add_to_tunnel(struct l2tp_tunnel *tunnel, 




/* Lookup a tunnel by id

/* Lookup a tunnel by id

 */

 */

struct l2tp_tunnel *l2tp_tunnel_find(struct net *net, u32 tunnel_id)

struct l2tp_tunnel *l2tp_tunnel_find(const struct net *net, u32 tunnel_id)

{

{

	struct l2tp_tunnel *tunnel;

	struct l2tp_tunnel *tunnel;

	struct l2tp_net *pn = l2tp_pernet(net);

	struct l2tp_net *pn = l2tp_pernet(net);
@@ -396,7 +397,7 @@ struct l2tp_tunnel *l2tp_tunnel_find(struct net *net, u32 tunnel_id) 
}

}

EXPORT_SYMBOL_GPL(l2tp_tunnel_find);

EXPORT_SYMBOL_GPL(l2tp_tunnel_find);





struct l2tp_tunnel *l2tp_tunnel_find_nth(struct net *net, int nth)

struct l2tp_tunnel *l2tp_tunnel_find_nth(const struct net *net, int nth)

{

{

	struct l2tp_net *pn = l2tp_pernet(net);

	struct l2tp_net *pn = l2tp_pernet(net);

	struct l2tp_tunnel *tunnel;

	struct l2tp_tunnel *tunnel;

net/l2tp/l2tp_core.h

+5 −4
Original line number Original line Diff line number Diff line
@@ -230,15 +230,16 @@ static inline struct l2tp_tunnel *l2tp_sock_to_tunnel(struct sock *sk) 
	return tunnel;

	return tunnel;

}

}





struct l2tp_session *l2tp_session_get(struct net *net,

struct l2tp_session *l2tp_session_get(const struct net *net,

				      struct l2tp_tunnel *tunnel,

				      struct l2tp_tunnel *tunnel,

				      u32 session_id, bool do_ref);

				      u32 session_id, bool do_ref);

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

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

					  bool do_ref);

					  bool do_ref);

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

struct l2tp_session *l2tp_session_get_by_ifname(const struct net *net,

						const char *ifname,

						bool do_ref);

						bool do_ref);

struct l2tp_tunnel *l2tp_tunnel_find(struct net *net, u32 tunnel_id);

struct l2tp_tunnel *l2tp_tunnel_find(const struct net *net, u32 tunnel_id);

struct l2tp_tunnel *l2tp_tunnel_find_nth(struct net *net, int nth);

struct l2tp_tunnel *l2tp_tunnel_find_nth(const struct net *net, int nth);





int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id,

int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id,

		       u32 peer_tunnel_id, struct l2tp_tunnel_cfg *cfg,

		       u32 peer_tunnel_id, struct l2tp_tunnel_cfg *cfg,