netfilter: conntrack: mark extension structs as const

[mirror_ubuntu-artful-kernel.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 4ec645c8b647f286a372df7940c5c4050742bb46..b01f73fb4dcbd1e82f91136e30fc2d2a71f0ab81 100644 (file)
--- a/include/net/netfilter/nf_conntrack_extend.h
+++ b/include/net/netfilter/nf_conntrack_extend.h
@@ -43,8 +43,8 @@ enum nf_ct_ext_id {
 /* Extensions: optional stuff which isn't permanently in struct. */
 struct nf_ct_ext {
        struct rcu_head rcu;
-       u16 offset[NF_CT_EXT_NUM];
-       u16 len;
+       u8 offset[NF_CT_EXT_NUM];
+       u8 len;
        char data[0];
 };
 
@@ -88,23 +88,17 @@ static inline void nf_ct_ext_free(struct nf_conn *ct)
 /* Add this type, returns pointer to data or NULL. */
 void *nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp);
 
-#define NF_CT_EXT_F_PREALLOC   0x0001
-
 struct nf_ct_ext_type {
        /* Destroys relationships (can be NULL). */
        void (*destroy)(struct nf_conn *ct);
 
        enum nf_ct_ext_id id;
 
-       unsigned int flags;
-
        /* Length and min alignment. */
        u8 len;
        u8 align;
-       /* initial size of nf_ct_ext. */
-       u8 alloc_size;
 };
 
-int nf_ct_extend_register(struct nf_ct_ext_type *type);
-void nf_ct_extend_unregister(struct nf_ct_ext_type *type);
+int nf_ct_extend_register(const struct nf_ct_ext_type *type);
+void nf_ct_extend_unregister(const struct nf_ct_ext_type *type);
 #endif /* _NF_CONNTRACK_EXTEND_H */