netfilter: helpers: remove data_len usage for inkernel helpers

[sfrench/cifs-2.6.git] / include / net / netfilter / nf_conntrack_helper.h

diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index 29539ed1008f7117e3b33b995dc6c70852ca8831..e04fa7691e5d6873cd04e94816227d4a41275fa2 100644 (file)
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -29,9 +29,6 @@ struct nf_conntrack_helper {
        struct module *me;              /* pointer to self */
        const struct nf_conntrack_expect_policy *expect_policy;
 
-       /* length of internal data, ie. sizeof(struct nf_ct_*_master) */
-       size_t data_len;
-
        /* Tuple of things we will help (compared against server response) */
        struct nf_conntrack_tuple tuple;
 
@@ -49,7 +46,11 @@ struct nf_conntrack_helper {
        unsigned int expect_class_max;
 
        unsigned int flags;
-       unsigned int queue_num;         /* For user-space helpers. */
+
+       /* For user-space helpers: */
+       unsigned int queue_num;
+       /* length of userspace private data stored in nf_conn_help->data */
+       u16 data_len;
 };
 
 /* Must be kept in sync with the classes defined by helpers */
@@ -82,7 +83,7 @@ void nf_ct_helper_init(struct nf_conntrack_helper *helper,
                       u16 l3num, u16 protonum, const char *name,
                       u16 default_port, u16 spec_port, u32 id,
                       const struct nf_conntrack_expect_policy *exp_pol,
-                      u32 expect_class_max, u32 data_len,
+                      u32 expect_class_max,
                       int (*help)(struct sk_buff *skb, unsigned int protoff,
                                   struct nf_conn *ct,
                                   enum ip_conntrack_info ctinfo),