bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

l2tp: drop net argument from l2tp_tunnel_create

Browse source 
The argument is unused, so remove it.

Signed-off-by: Tom Parkin <tparkin@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tom Parkin 2020-09-03 09:54:49 +01:00 • committed by David S. Miller
parent 039bca78cb
commit c9ccd4c63c
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/l2tp/l2tp_core.c
View file

@ -1381,7 +1381,7 @@ out:
static struct lock_class_key l2tp_socket_class; 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_cfg *cfg, struct l2tp_tunnel **tunnelp)
{ {
struct l2tp_tunnel *tunnel = NULL; struct l2tp_tunnel *tunnel = NULL;

2
net/l2tp/l2tp_core.h
View file

@ -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. * Creation of a new instance is a two-step process: create, then register.
* Destruction is triggered using the *_delete functions, and completes asynchronously. * 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, u32 peer_tunnel_id, struct l2tp_tunnel_cfg *cfg,
struct l2tp_tunnel **tunnelp); struct l2tp_tunnel **tunnelp);
int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net, int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,

2
net/l2tp/l2tp_netlink.c
View file

@ -233,7 +233,7 @@ static int l2tp_nl_cmd_tunnel_create(struct sk_buff *skb, struct genl_info *info
switch (cfg.encap) { switch (cfg.encap) {
case L2TP_ENCAPTYPE_UDP: case L2TP_ENCAPTYPE_UDP:
case L2TP_ENCAPTYPE_IP: 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); peer_tunnel_id, &cfg, &tunnel);
break; break;
} }

2
net/l2tp/l2tp_ppp.c
View file

@ -712,7 +712,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
goto end; goto end;
} }
error = l2tp_tunnel_create(sock_net(sk), info.fd, error = l2tp_tunnel_create(info.fd,
info.version, info.version,
info.tunnel_id, info.tunnel_id,
info.peer_tunnel_id, &tcfg, info.peer_tunnel_id, &tcfg,