Merge branch 'linus' into tracing/mmiotrace-mergefixups

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

diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h
index 49aac6323fbeaf7c4dacbb16c8194d91246977bf..f80c0ed6d870f3514e39f9da71ce399927919465 100644 (file)
--- a/include/net/netfilter/nf_conntrack_extend.h
+++ b/include/net/netfilter/nf_conntrack_extend.h
@@ -15,9 +15,9 @@ enum nf_ct_ext_id
 
 /* Extensions: optional stuff which isn't permanently in struct. */
 struct nf_ct_ext {
+       struct rcu_head rcu;
        u8 offset[NF_CT_EXT_NUM];
        u8 len;
-       u8 real_len;
        char data[0];
 };