Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[~andy/linux] / include / net / netfilter / nf_conntrack_l4proto.h

diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 08bb571b7abdac28ef2461332103539bcfb0b9b9..c3be4aef6bf7d37055e521ca6f5dcf4468e8ae49 100644 (file)
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -99,6 +99,9 @@ struct nf_conntrack_l4proto {
        /* Init l4proto pernet data */
        int (*init_net)(struct net *net, u_int16_t proto);
 
+       /* Return the per-net protocol part. */
+       struct nf_proto_net *(*get_net_proto)(struct net *net);
+
        /* Protocol name */
        const char *name;