diff options
| author | Florian Westphal | 2019-01-15 22:03:45 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2019-01-18 15:02:34 +0100 |
| commit | 2a389de86e4a5d0bd3abed9e6fee27050652d339 (patch) | |
| tree | 81347462e74cf1e64757a72202dc027fb7210d72 /include/net/netfilter/nf_conntrack_l4proto.h | |
| parent | netfilter: conntrack: remove sysctl registration helpers (diff) | |
| download | kernel-qcow2-linux-2a389de86e4a5d0bd3abed9e6fee27050652d339.tar.gz kernel-qcow2-linux-2a389de86e4a5d0bd3abed9e6fee27050652d339.tar.xz kernel-qcow2-linux-2a389de86e4a5d0bd3abed9e6fee27050652d339.zip | |
netfilter: conntrack: remove l4proto init and get_net callbacks
Those were needed we still had modular trackers.
As we don't have those anymore, prefer direct calls and remove all
the (un)register infrastructure associated with this.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net/netfilter/nf_conntrack_l4proto.h')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_l4proto.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h index 87d9c198c05e..d5909e51ca92 100644 --- a/include/net/netfilter/nf_conntrack_l4proto.h +++ b/include/net/netfilter/nf_conntrack_l4proto.h @@ -61,12 +61,6 @@ struct nf_conntrack_l4proto { /* Print out the private part of the conntrack. */ void (*print_conntrack)(struct seq_file *s, struct nf_conn *); #endif - - /* Init l4proto pernet data */ - int (*init_net)(struct net *net); - - /* Return the per-net protocol part. */ - struct nf_proto_net *(*get_net_proto)(struct net *net); }; bool icmp_pkt_to_tuple(const struct sk_buff *skb, @@ -135,6 +129,15 @@ int nf_conntrack_gre_packet(struct nf_conn *ct, enum ip_conntrack_info ctinfo, const struct nf_hook_state *state); +void nf_conntrack_generic_init_net(struct net *net); +void nf_conntrack_tcp_init_net(struct net *net); +void nf_conntrack_udp_init_net(struct net *net); +void nf_conntrack_gre_init_net(struct net *net); +void nf_conntrack_dccp_init_net(struct net *net); +void nf_conntrack_sctp_init_net(struct net *net); +void nf_conntrack_icmp_init_net(struct net *net); +void nf_conntrack_icmpv6_init_net(struct net *net); + /* Existing built-in generic protocol */ extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_generic; |