Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d0c9c4e authored by Patrick McHardy's avatar Patrick McHardy
Browse files

net: fib_rules: mark arguments to fib_rules_register const and __net_initdata 



fib_rules_register() duplicates the template passed to it without modification,
mark the argument as const. Additionally the templates are only needed when
instantiating a new namespace, so mark them as __net_initdata, which means
they can be discarded when CONFIG_NET_NS=n.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 8c52d509

include/net/fib_rules.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static inline u32 frh_get_table(struct fib_rule_hdr *frh, struct nlattr **nla) 
	return frh->table;

}



extern struct fib_rules_ops *fib_rules_register(struct fib_rules_ops *, struct net *);

extern struct fib_rules_ops *fib_rules_register(const struct fib_rules_ops *, struct net *);

extern void fib_rules_unregister(struct fib_rules_ops *);

extern void                     fib_rules_cleanup_ops(struct fib_rules_ops *);

net/core/fib_rules.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ errout: 
}



struct fib_rules_ops *

fib_rules_register(struct fib_rules_ops *tmpl, struct net *net)

fib_rules_register(const struct fib_rules_ops *tmpl, struct net *net)

{

	struct fib_rules_ops *ops;

	int err;

net/decnet/dn_rules.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static void dn_fib_rule_flush_cache(struct fib_rules_ops *ops) 
	dn_rt_cache_flush(-1);

}



static struct fib_rules_ops dn_fib_rules_ops_template = {

static const struct fib_rules_ops __net_initdata dn_fib_rules_ops_template = {

	.family		= FIB_RULES_DECNET,

	.rule_size	= sizeof(struct dn_fib_rule),

	.addr_size	= sizeof(u16),

net/ipv4/fib_rules.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static void fib4_rule_flush_cache(struct fib_rules_ops *ops) 
	rt_cache_flush(ops->fro_net, -1);

}



static struct fib_rules_ops fib4_rules_ops_template = {

static const struct fib_rules_ops __net_initdata fib4_rules_ops_template = {

	.family		= FIB_RULES_IPV4,

	.rule_size	= sizeof(struct fib4_rule),

	.addr_size	= sizeof(u32),

net/ipv4/ipmr.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static int ipmr_rule_fill(struct fib_rule *rule, struct sk_buff *skb, 
	return 0;

}



static struct fib_rules_ops ipmr_rules_ops_template = {

static const struct fib_rules_ops __net_initdata ipmr_rules_ops_template = {

	.family		= FIB_RULES_IPMR,

	.rule_size	= sizeof(struct ipmr_rule),

	.addr_size	= sizeof(u32),