From: Kuniyuki Iwashima Date: Wed, 31 Jul 2024 20:07:16 +0000 (-0700) Subject: l2tp: Don't assign net->gen->ptr[] for pppol2tp_net_ops. X-Git-Tag: v6.12-rc1~232^2~321^2~5 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1ad001347fb1ca1f036144b42a6f1df6615e4104;p=linux-block.git 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 Reviewed-by: Simon Horman Reviewed-by: James Chapman Signed-off-by: David S. Miller --- 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, }; /*****************************************************************************