Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / 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 96a58d8e1d3f8011226862e8ae765b90683c7ace..15888fc7b72dc5ab49d702886fc7fa083bbe0a90 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 */
@@ -58,19 +58,18 @@ struct nf_conntrack_l3proto
 
        /*
         * Called before tracking. 
-        *      *dataoff: offset of protocol header (TCP, UDP,...) in *pskb
+        *      *dataoff: offset of protocol header (TCP, UDP,...) in skb
         *      *protonum: protocol number
         */
-       int (*prepare)(struct sk_buff **pskb, unsigned int hooknum,
-                      unsigned int *dataoff, u_int8_t *protonum);
-
-       u_int32_t (*get_features)(const struct nf_conntrack_tuple *tuple);
+       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;
@@ -91,8 +90,6 @@ extern struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto);
 extern void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p);
 
 /* Existing built-in protocols */
-extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;
-extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;
 extern struct nf_conntrack_l3proto nf_conntrack_l3proto_generic;
 
 static inline struct nf_conntrack_l3proto *