[PATCH 2.6.25] IPv4: thresholds in fib_trie.c are not modified, make them const
IPv4: thresholds in fib_trie.c are not modified, make them const Signed-off-by: Denis V. Lunev <den@openvz.org> diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 45a6e4d..57a2c46 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -299,10 +299,10 @@ static inline void check_tnode(const struct tnode *tn) WARN_ON(tn && tn->pos+tn->bits > 32); } -static int halve_threshold = 25; -static int inflate_threshold = 50; -static int halve_threshold_root = 15; -static int inflate_threshold_root = 25; +static const int halve_threshold = 25; +static const int inflate_threshold = 50; +static const int halve_threshold_root = 15; +static const int inflate_threshold_root = 25; static void __alias_free_mem(struct rcu_head *head) {
Re: [PATCH 2.6.25] IPv4: thresholds in fib_trie.c are not modified, make them const
From: "Denis V. Lunev" <den@openvz.org> Date: Wed, 12 Dec 2007 14:05:55 +0300 > -static int halve_threshold = 25; > -static int inflate_threshold = 50; > -static int halve_threshold_root = 15; > -static int inflate_threshold_root = 25; halve_threshold_root and inflate_threshold_root have different values in the net-2.6.25 tree. What tree are you patching against? These were changed way back in: commit 965ffea43d4ebe8cd7b9fee78d651268dd7d23c5 Author: Robert Olsson <robert.olsson@its.uu.se> Date: Mon Mar 19 16:29:58 2007 -0700 [IPV4]: fib_trie root node settings The threshold for root node can be more aggressive set to get better tree compression. The new setting mekes the root grow from 16 to 19 bits and substansial improvemnt in Aver depth this with the current table of 214393 prefixes But really the dynamic resize should need more investigation both in terms convergence and performance and maybe it should be possible to change... Maybe just for the brave to start with or we may have to back this out. Please don't waste my time like this. Always submit patches against the current tree, even if you "think" the files you are patching haven't changed.
David Miller wrote: > From: "Denis V. Lunev" <den@openvz.org> > Date: Wed, 12 Dec 2007 14:05:55 +0300 > >> -static int halve_threshold = 25; >> -static int inflate_threshold = 50; >> -static int halve_threshold_root = 15; >> -static int inflate_threshold_root = 25; > > halve_threshold_root and inflate_threshold_root have different > values in the net-2.6.25 tree. oops. this was accidentally changed during porting of the code from the one old tree and committed by mistake. I'll resend correct patch in a minute > > What tree are you patching against? These were changed way > back in: