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

Commit eb61cabd authored by Guillaume Nault's avatar Guillaume Nault Committed by Greg Kroah-Hartman
Browse files

l2tp: define parameters of l2tp_session_get*() as "const" 



commit 9aaef50c44f132e040dcd7686c8e78a3390037c5 upstream.

Make l2tp_pernet()'s parameter constant, so that l2tp_session_get*() can
declare their "net" variable as "const".
Also constify "ifname" in l2tp_session_get_by_ifname().

Signed-off-by: default avatarGuillaume Nault <g.nault@alphalink.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGiuliano Procida <gprocida@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e27738d0

net/l2tp/l2tp_core.c

+4 −3
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static inline struct l2tp_tunnel *l2tp_tunnel(struct sock *sk) 
	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);
@@ -231,7 +231,7 @@ l2tp_session_id_hash(struct l2tp_tunnel *tunnel, u32 session_id) 
/* 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,

struct l2tp_session *l2tp_session_get(const struct net *net,

				      struct l2tp_tunnel *tunnel,

				      u32 session_id, bool do_ref)

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

 * 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)

{

	struct l2tp_net *pn = l2tp_pernet(net);

net/l2tp/l2tp_core.h

+3 −2
Original line number Diff line number Diff line
@@ -231,12 +231,13 @@ static inline struct l2tp_tunnel *l2tp_sock_to_tunnel(struct sock *sk) 
	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,

				      u32 session_id, bool do_ref);

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,

struct l2tp_session *l2tp_session_get_by_ifname(const struct net *net,

						const char *ifname,

						bool do_ref);

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

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