Merge branch 'topic/jack' into for-linus

[linux-2.6-omap-h63xx.git] / include / net / netfilter / nf_conntrack_l3proto.h

diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index 3c58a2c4df283e98014c16a35089b7581f1f8e7c..0378676c3dd816ba97a172359240a59153612e84 100644 (file)
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -11,11 +11,11 @@
 
 #ifndef _NF_CONNTRACK_L3PROTO_H
 #define _NF_CONNTRACK_L3PROTO_H
+#include <linux/netlink.h>
+#include <net/netlink.h>
 #include <linux/seq_file.h>
 #include <net/netfilter/nf_conntrack.h>
 
-struct nfattr;
-
 struct nf_conntrack_l3proto
 {
        /* L3 Protocol Family number. ex) PF_INET */
@@ -28,34 +28,20 @@ struct nf_conntrack_l3proto
         * Try to fill in the third arg: nhoff is offset of l3 proto
          * hdr.  Return true if possible.
         */
-       int (*pkt_to_tuple)(const struct sk_buff *skb, unsigned int nhoff,
-                           struct nf_conntrack_tuple *tuple);
+       bool (*pkt_to_tuple)(const struct sk_buff *skb, unsigned int nhoff,
+                            struct nf_conntrack_tuple *tuple);
 
        /*
         * Invert the per-proto part of the tuple: ie. turn xmit into reply.
         * Some packets can't be inverted: return 0 in that case.
         */
-       int (*invert_tuple)(struct nf_conntrack_tuple *inverse,
-                           const struct nf_conntrack_tuple *orig);
+       bool (*invert_tuple)(struct nf_conntrack_tuple *inverse,
+                            const struct nf_conntrack_tuple *orig);
 
        /* Print out the per-protocol part of the tuple. */
        int (*print_tuple)(struct seq_file *s,
                           const struct nf_conntrack_tuple *);
 
-       /* Print out the private part of the conntrack. */
-       int (*print_conntrack)(struct seq_file *s, const struct nf_conn *);
-
-       /* Returns verdict for packet, or -1 for invalid. */
-       int (*packet)(struct nf_conn *conntrack,
-                     const struct sk_buff *skb,
-                     enum ip_conntrack_info ctinfo);
-
-       /*
-        * Called when a new connection for this protocol found;
-        * returns TRUE if it's OK.  If so, packet() called next.
-        */
-       int (*new)(struct nf_conn *conntrack, const struct sk_buff *skb);
-
        /*
         * Called before tracking. 
         *      *dataoff: offset of protocol header (TCP, UDP,...) in skb
@@ -64,15 +50,16 @@ struct nf_conntrack_l3proto
        int (*get_l4proto)(const struct sk_buff *skb, unsigned int nhoff,
                           unsigned int *dataoff, u_int8_t *protonum);
 
-       int (*tuple_to_nfattr)(struct sk_buff *skb,
+       int (*tuple_to_nlattr)(struct sk_buff *skb,
                               const struct nf_conntrack_tuple *t);
 
-       int (*nfattr_to_tuple)(struct nfattr *tb[],
+       int (*nlattr_to_tuple)(struct nlattr *tb[],
                               struct nf_conntrack_tuple *t);
+       const struct nla_policy *nla_policy;
 
 #ifdef CONFIG_SYSCTL
        struct ctl_table_header *ctl_table_header;
-       struct ctl_table        *ctl_table_path;
+       struct ctl_path         *ctl_table_path;
        struct ctl_table        *ctl_table;
 #endif /* CONFIG_SYSCTL */