[XFS] fix compilation without CONFIG_PROC_FS

[linux-2.6-omap-h63xx.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 f46cb930414cc8a1cdd27c5d688a688a154fc301..723df9d1cc35886524935f258be805ed83120e5c 100644 (file)
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -9,10 +9,11 @@
 
 #ifndef _NF_CONNTRACK_L4PROTO_H
 #define _NF_CONNTRACK_L4PROTO_H
+#include <linux/netlink.h>
+#include <net/netlink.h>
 #include <net/netfilter/nf_conntrack.h>
 
 struct seq_file;
-struct nfattr;
 
 struct nf_conntrack_l4proto
 {
@@ -22,30 +23,19 @@ struct nf_conntrack_l4proto
        /* L4 Protocol number. */
        u_int8_t l4proto;
 
-       /* Protocol name */
-       const char *name;
-
        /* Try to fill in the third arg: dataoff is offset past network protocol
            hdr.  Return true if possible. */
-       int (*pkt_to_tuple)(const struct sk_buff *skb,
-                           unsigned int dataoff,
-                           struct nf_conntrack_tuple *tuple);
+       bool (*pkt_to_tuple)(const struct sk_buff *skb, unsigned int dataoff,
+                            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);
-
-       /* Print out the per-protocol part of the tuple. Return like seq_* */
-       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 *);
+       bool (*invert_tuple)(struct nf_conntrack_tuple *inverse,
+                            const struct nf_conntrack_tuple *orig);
 
        /* Returns verdict for packet, or -1 for invalid. */
-       int (*packet)(struct nf_conn *conntrack,
+       int (*packet)(struct nf_conn *ct,
                      const struct sk_buff *skb,
                      unsigned int dataoff,
                      enum ip_conntrack_info ctinfo,
@@ -54,27 +44,35 @@ struct nf_conntrack_l4proto
 
        /* 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,
-                  unsigned int dataoff);
+       bool (*new)(struct nf_conn *ct, const struct sk_buff *skb,
+                   unsigned int dataoff);
 
        /* Called when a conntrack entry is destroyed */
-       void (*destroy)(struct nf_conn *conntrack);
+       void (*destroy)(struct nf_conn *ct);
 
        int (*error)(struct sk_buff *skb, unsigned int dataoff,
                     enum ip_conntrack_info *ctinfo,
                     int pf, unsigned int hooknum);
 
+       /* Print out the per-protocol part of the tuple. Return like seq_* */
+       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 *);
+
        /* convert protoinfo to nfnetink attributes */
-       int (*to_nfattr)(struct sk_buff *skb, struct nfattr *nfa,
+       int (*to_nlattr)(struct sk_buff *skb, struct nlattr *nla,
                         const struct nf_conn *ct);
 
        /* convert nfnetlink attributes to protoinfo */
-       int (*from_nfattr)(struct nfattr *tb[], struct nf_conn *ct);
+       int (*from_nlattr)(struct nlattr *tb[], struct nf_conn *ct);
 
-       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;
@@ -85,6 +83,8 @@ struct nf_conntrack_l4proto
        struct ctl_table        *ctl_compat_table;
 #endif
 #endif
+       /* Protocol name */
+       const char *name;
 
        /* Module (if any) which this is connected to. */
        struct module *me;
@@ -111,10 +111,11 @@ extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);
 extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);
 
 /* Generic netlink helpers */
-extern int nf_ct_port_tuple_to_nfattr(struct sk_buff *skb,
+extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,
                                      const struct nf_conntrack_tuple *tuple);
-extern int nf_ct_port_nfattr_to_tuple(struct nfattr *tb[],
+extern int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[],
                                      struct nf_conntrack_tuple *t);
+extern const struct nla_policy nf_ct_port_nla_policy[];
 
 /* Log invalid packets */
 extern unsigned int nf_ct_log_invalid;