diff options
author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2024-07-31 13:07:16 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2024-08-03 22:38:44 +0100 |
commit | 1ad001347fb1ca1f036144b42a6f1df6615e4104 (patch) | |
tree | 6df5dc3ddc0f02b0cbe0f36ccd7f8922d7e406eb /net/l2tp | |
parent | c4b28e5699d2a789fc9464e7ce89f2a1e9d5085d (diff) | |
download | lwn-1ad001347fb1ca1f036144b42a6f1df6615e4104.tar.gz lwn-1ad001347fb1ca1f036144b42a6f1df6615e4104.zip |
l2tp: Don't assign net->gen->ptr[] for pppol2tp_net_ops.
Commit fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and
ppp parts") converted net->gen->ptr[pppol2tp_net_id] in l2tp_ppp.c to
net->gen->ptr[l2tp_net_id] in l2tp_core.c.
Now the leftover wastes one entry of net->gen->ptr[] in each netns.
Let's avoid the unwanted allocation.
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
-rw-r--r-- | net/l2tp/l2tp_ppp.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 90bf3a8ccab6..9b4273fd518a 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -1393,8 +1393,6 @@ end: * L2TPv2, we dump only L2TPv2 tunnels and sessions here. *****************************************************************************/ -static unsigned int pppol2tp_net_id; - #ifdef CONFIG_PROC_FS struct pppol2tp_seq_data { @@ -1628,7 +1626,6 @@ static __net_exit void pppol2tp_exit_net(struct net *net) static struct pernet_operations pppol2tp_net_ops = { .init = pppol2tp_init_net, .exit = pppol2tp_exit_net, - .id = &pppol2tp_net_id, }; /***************************************************************************** |