@@ -175,8 +175,7 @@ static struct nf_proto_net *nf_ct_l4proto_net(struct net *net,
175
175
176
176
static
177
177
int nf_ct_l4proto_register_sysctl (struct net * net ,
178
- struct nf_proto_net * pn ,
179
- const struct nf_conntrack_l4proto * l4proto )
178
+ struct nf_proto_net * pn )
180
179
{
181
180
int err = 0 ;
182
181
@@ -198,9 +197,7 @@ int nf_ct_l4proto_register_sysctl(struct net *net,
198
197
}
199
198
200
199
static
201
- void nf_ct_l4proto_unregister_sysctl (struct net * net ,
202
- struct nf_proto_net * pn ,
203
- const struct nf_conntrack_l4proto * l4proto )
200
+ void nf_ct_l4proto_unregister_sysctl (struct nf_proto_net * pn )
204
201
{
205
202
#ifdef CONFIG_SYSCTL
206
203
if (pn -> ctl_table_header != NULL )
@@ -252,7 +249,7 @@ int nf_ct_l4proto_pernet_register_one(struct net *net,
252
249
if (pn == NULL )
253
250
goto out ;
254
251
255
- ret = nf_ct_l4proto_register_sysctl (net , pn , l4proto );
252
+ ret = nf_ct_l4proto_register_sysctl (net , pn );
256
253
if (ret < 0 )
257
254
goto out ;
258
255
@@ -296,7 +293,7 @@ void nf_ct_l4proto_pernet_unregister_one(struct net *net,
296
293
return ;
297
294
298
295
pn -> users -- ;
299
- nf_ct_l4proto_unregister_sysctl (net , pn , l4proto );
296
+ nf_ct_l4proto_unregister_sysctl (pn );
300
297
}
301
298
EXPORT_SYMBOL_GPL (nf_ct_l4proto_pernet_unregister_one );
302
299
@@ -946,16 +943,14 @@ int nf_conntrack_proto_pernet_init(struct net *net)
946
943
if (err < 0 )
947
944
return err ;
948
945
err = nf_ct_l4proto_register_sysctl (net ,
949
- pn ,
950
- & nf_conntrack_l4proto_generic );
946
+ pn );
951
947
if (err < 0 )
952
948
return err ;
953
949
954
950
err = nf_ct_l4proto_pernet_register (net , builtin_l4proto ,
955
951
ARRAY_SIZE (builtin_l4proto ));
956
952
if (err < 0 ) {
957
- nf_ct_l4proto_unregister_sysctl (net , pn ,
958
- & nf_conntrack_l4proto_generic );
953
+ nf_ct_l4proto_unregister_sysctl (pn );
959
954
return err ;
960
955
}
961
956
@@ -971,9 +966,7 @@ void nf_conntrack_proto_pernet_fini(struct net *net)
971
966
nf_ct_l4proto_pernet_unregister (net , builtin_l4proto ,
972
967
ARRAY_SIZE (builtin_l4proto ));
973
968
pn -> users -- ;
974
- nf_ct_l4proto_unregister_sysctl (net ,
975
- pn ,
976
- & nf_conntrack_l4proto_generic );
969
+ nf_ct_l4proto_unregister_sysctl (pn );
977
970
}
978
971
979
972
0 commit comments