Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca2ca6e1 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: remove unused proto arg from netns init functions 



Its unused, next patch will remove l4proto->l3proto number to simplify
l4 protocol demuxer lookup.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 6fe78fa4

include/net/netfilter/nf_conntrack_l4proto.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct nf_conntrack_l4proto { 
#endif

	unsigned int	*net_id;

	/* Init l4proto pernet data */

	int (*init_net)(struct net *net, u_int16_t proto);

	int (*init_net)(struct net *net);



	/* Return the per-net protocol part. */

	struct nf_proto_net *(*get_net_proto)(struct net *net);

net/netfilter/nf_conntrack_proto.c

+2 −3
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ int nf_ct_l4proto_pernet_register_one(struct net *net, 
	struct nf_proto_net *pn = NULL;



	if (l4proto->init_net) {

		ret = l4proto->init_net(net, l4proto->l3proto);

		ret = l4proto->init_net(net);

		if (ret < 0)

			goto out;

	}
@@ -988,8 +988,7 @@ int nf_conntrack_proto_pernet_init(struct net *net) 
	struct nf_proto_net *pn = nf_ct_l4proto_net(net,

					&nf_conntrack_l4proto_generic);



	err = nf_conntrack_l4proto_generic.init_net(net,

					nf_conntrack_l4proto_generic.l3proto);

	err = nf_conntrack_l4proto_generic.init_net(net);

	if (err < 0)

		return err;

	err = nf_ct_l4proto_register_sysctl(net,

net/netfilter/nf_conntrack_proto_dccp.c

+1 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ static int dccp_kmemdup_sysctl_table(struct net *net, struct nf_proto_net *pn, 
	return 0;

}



static int dccp_init_net(struct net *net, u_int16_t proto)

static int dccp_init_net(struct net *net)

{

	struct nf_dccp_net *dn = dccp_pernet(net);

	struct nf_proto_net *pn = &dn->pn;

net/netfilter/nf_conntrack_proto_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int generic_kmemdup_sysctl_table(struct nf_proto_net *pn, 
	return 0;

}



static int generic_init_net(struct net *net, u_int16_t proto)

static int generic_init_net(struct net *net)

{

	struct nf_generic_net *gn = generic_pernet(net);

	struct nf_proto_net *pn = &gn->pn;

net/netfilter/nf_conntrack_proto_gre.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ gre_timeout_nla_policy[CTA_TIMEOUT_GRE_MAX+1] = { 
};

#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */



static int gre_init_net(struct net *net, u_int16_t proto)

static int gre_init_net(struct net *net)

{

	struct netns_proto_gre *net_gre = gre_pernet(net);

	int i;