Commit 23f671a1 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: mark extension structs as const 



Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 54044b1f

include/net/netfilter/nf_conntrack_extend.h

+2 −2
Original line number Diff line number Diff line
@@ -99,6 +99,6 @@ struct nf_ct_ext_type { 
	u8 align;

};



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 */

net/netfilter/nf_conntrack_acct.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir) 
};

EXPORT_SYMBOL_GPL(seq_print_acct);



static struct nf_ct_ext_type acct_extend __read_mostly = {

static const struct nf_ct_ext_type acct_extend = {

	.len	= sizeof(struct nf_conn_acct),

	.align	= __alignof__(struct nf_conn_acct),

	.id	= NF_CT_EXT_ACCT,

net/netfilter/nf_conntrack_ecache.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static struct ctl_table event_sysctl_table[] = { 
};

#endif /* CONFIG_SYSCTL */



static struct nf_ct_ext_type event_extend __read_mostly = {

static const struct nf_ct_ext_type event_extend = {

	.len	= sizeof(struct nf_conntrack_ecache),

	.align	= __alignof__(struct nf_conntrack_ecache),

	.id	= NF_CT_EXT_ECACHE,

net/netfilter/nf_conntrack_extend.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ void *nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp) 
EXPORT_SYMBOL(nf_ct_ext_add);



/* This MUST be called in process context. */

int nf_ct_extend_register(struct nf_ct_ext_type *type)

int nf_ct_extend_register(const struct nf_ct_ext_type *type)

{

	int ret = 0;
@@ -134,7 +134,7 @@ out: 
EXPORT_SYMBOL_GPL(nf_ct_extend_register);



/* This MUST be called in process context. */

void nf_ct_extend_unregister(struct nf_ct_ext_type *type)

void nf_ct_extend_unregister(const struct nf_ct_ext_type *type)

{

	mutex_lock(&nf_ct_ext_type_mutex);

	RCU_INIT_POINTER(nf_ct_ext_types[type->id], NULL);

net/netfilter/nf_conntrack_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ void nf_conntrack_helpers_unregister(struct nf_conntrack_helper *helper, 
}

EXPORT_SYMBOL_GPL(nf_conntrack_helpers_unregister);



static struct nf_ct_ext_type helper_extend __read_mostly = {

static const struct nf_ct_ext_type helper_extend = {

	.len	= sizeof(struct nf_conn_help),

	.align	= __alignof__(struct nf_conn_help),

	.id	= NF_CT_EXT_HELPER,

CRA Git | Maintained and supported by SUSTech CRA and CCSE