diff options
| author | Florian Westphal <fw@strlen.de> | 2018-06-29 07:46:47 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-07-16 17:54:59 +0200 |
| commit | 6816d931cab009024b68c11c4cf752f8bf9a1e32 (patch) | |
| tree | b3098b1cb94f482e0289598a5fc3d7e038fc1c2b /net/netfilter/nf_conntrack_proto.c | |
| parent | d1b6fe94941f43e4743d5fea953d16b0a001c2c6 (diff) | |
netfilter: conntrack: remove get_l4proto indirection from l3 protocol trackers
Handle it in the core instead.
ipv6_skip_exthdr() is built-in even if ipv6 is a module, i.e. this
doesn't create an ipv6 dependency.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_proto.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c index 859cb303bb91..39df72bb9d56 100644 --- a/net/netfilter/nf_conntrack_proto.c +++ b/net/netfilter/nf_conntrack_proto.c @@ -35,6 +35,11 @@ EXPORT_SYMBOL_GPL(nf_ct_l3protos); static DEFINE_MUTEX(nf_ct_proto_mutex); +struct nf_conntrack_l3proto nf_conntrack_l3proto_generic __read_mostly = { + .l3proto = PF_UNSPEC, +}; +EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_generic); + #ifdef CONFIG_SYSCTL static int nf_ct_register_sysctl(struct net *net, |