Commit c9ccd4c6 authored Sep 03, 2020 by Tom Parkin Committed by David S. Miller Sep 03, 2020

l2tp: drop net argument from l2tp_tunnel_create



The argument is unused, so remove it.

Signed-off-by: Tom Parkin <tparkin@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 039bca78

net/l2tp/l2tp_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1381,7 +1381,7 @@ static int l2tp_tunnel_sock_create(struct net *net,

		static struct lock_class_key l2tp_socket_class;

		int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32 peer_tunnel_id,
		int l2tp_tunnel_create(int fd, int version, u32 tunnel_id, u32 peer_tunnel_id,
		struct l2tp_tunnel_cfg cfg, struct l2tp_tunnel *tunnelp)
		{
		struct l2tp_tunnel *tunnel = NULL;

net/l2tp/l2tp_core.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -235,7 +235,7 @@ struct l2tp_session l2tp_session_get_by_ifname(const struct net net,
		* Creation of a new instance is a two-step process: create, then register.
		* Destruction is triggered using the *_delete functions, and completes asynchronously.
		*/
		int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id,
		int l2tp_tunnel_create(int fd, int version, u32 tunnel_id,
		u32 peer_tunnel_id, struct l2tp_tunnel_cfg *cfg,
		struct l2tp_tunnel **tunnelp);
		int l2tp_tunnel_register(struct l2tp_tunnel tunnel, struct net net,

net/l2tp/l2tp_netlink.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -233,7 +233,7 @@ static int l2tp_nl_cmd_tunnel_create(struct sk_buff skb, struct genl_info info
		switch (cfg.encap) {
		case L2TP_ENCAPTYPE_UDP:
		case L2TP_ENCAPTYPE_IP:
		ret = l2tp_tunnel_create(net, fd, proto_version, tunnel_id,
		ret = l2tp_tunnel_create(fd, proto_version, tunnel_id,
		peer_tunnel_id, &cfg, &tunnel);
		break;
		}

net/l2tp/l2tp_ppp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -712,7 +712,7 @@ static int pppol2tp_connect(struct socket sock, struct sockaddr uservaddr,
		goto end;
		}

		error = l2tp_tunnel_create(sock_net(sk), info.fd,
		error = l2tp_tunnel_create(info.fd,
		info.version,
		info.tunnel_id,
		info.peer_tunnel_id, &tcfg,