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

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

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



commit 2f858b928bf5a8174911aaec76b8b72a9ca0533d upstream.

l2tp_tunnel_find() and l2tp_tunnel_find_nth() don't modify "net".

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 eb61cabd

net/l2tp/l2tp_core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -378,7 +378,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 +396,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

+2 −2
Original line number Original line Diff line number Diff line
@@ -239,8 +239,8 @@ struct l2tp_session *l2tp_session_get_nth(struct l2tp_tunnel *tunnel, int nth, 
struct l2tp_session *l2tp_session_get_by_ifname(const struct net *net,

struct l2tp_session *l2tp_session_get_by_ifname(const struct net *net,

						const char *ifname,

						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,