netfilter: conntrack: no need to pass ctinfo to error handler

[mirror_ubuntu-artful-kernel.git] / 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 de629f1520df2d476f74acab98ba08cbadd03a92..85e993e278d5e1e7a886e772dd69f5031214410d 100644 (file)
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -55,7 +55,7 @@ struct nf_conntrack_l4proto {
        void (*destroy)(struct nf_conn *ct);
 
        int (*error)(struct net *net, struct nf_conn *tmpl, struct sk_buff *skb,
-                    unsigned int dataoff, enum ip_conntrack_info *ctinfo,
+                    unsigned int dataoff,
                     u_int8_t pf, unsigned int hooknum);
 
        /* Print out the per-protocol part of the tuple. Return like seq_* */
@@ -98,7 +98,7 @@ struct nf_conntrack_l4proto {
                const struct nla_policy *nla_policy;
        } ctnl_timeout;
 #endif
-       int     *net_id;
+       unsigned int    *net_id;
        /* Init l4proto pernet data */
        int (*init_net)(struct net *net, u_int16_t proto);
 
@@ -125,14 +125,24 @@ struct nf_conntrack_l4proto *nf_ct_l4proto_find_get(u_int16_t l3proto,
 void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p);
 
 /* Protocol pernet registration. */
+int nf_ct_l4proto_pernet_register_one(struct net *net,
+                                     struct nf_conntrack_l4proto *proto);
+void nf_ct_l4proto_pernet_unregister_one(struct net *net,
+                                        struct nf_conntrack_l4proto *proto);
 int nf_ct_l4proto_pernet_register(struct net *net,
-                                 struct nf_conntrack_l4proto *proto);
+                                 struct nf_conntrack_l4proto *proto[],
+                                 unsigned int num_proto);
 void nf_ct_l4proto_pernet_unregister(struct net *net,
-                                    struct nf_conntrack_l4proto *proto);
+                                    struct nf_conntrack_l4proto *proto[],
+                                    unsigned int num_proto);
 
 /* Protocol global registration. */
-int nf_ct_l4proto_register(struct nf_conntrack_l4proto *proto);
-void nf_ct_l4proto_unregister(struct nf_conntrack_l4proto *proto);
+int nf_ct_l4proto_register_one(struct nf_conntrack_l4proto *proto);
+void nf_ct_l4proto_unregister_one(struct nf_conntrack_l4proto *proto);
+int nf_ct_l4proto_register(struct nf_conntrack_l4proto *proto[],
+                          unsigned int num_proto);
+void nf_ct_l4proto_unregister(struct nf_conntrack_l4proto *proto[],
+                             unsigned int num_proto);
 
 /* Generic netlink helpers */
 int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,