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

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

netfilter: conntrack: remove net_id 



No users anymore.

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

include/net/netfilter/nf_conntrack_l4proto.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct nf_conntrack_l4proto { 
	/* Print out the private part of the conntrack. */

	void (*print_conntrack)(struct seq_file *s, struct nf_conn *);

#endif

	unsigned int	*net_id;



	/* Init l4proto pernet data */

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

net/netfilter/nf_conntrack_proto.c

+2 −6
Original line number Diff line number Diff line
@@ -163,13 +163,9 @@ static int kill_l4proto(struct nf_conn *i, void *data) 
static struct nf_proto_net *nf_ct_l4proto_net(struct net *net,

				const struct nf_conntrack_l4proto *l4proto)

{

	if (l4proto->get_net_proto) {

		/* statically built-in protocols use static per-net */

	if (l4proto->get_net_proto)

		return l4proto->get_net_proto(net);

	} else if (l4proto->net_id) {

		/* ... and loadable protocols use dynamic per-net */

		return net_generic(net, *l4proto->net_id);

	}



	return NULL;

}