diff options
Diffstat (limited to 'net/ipv4/fib_trie.c')
-rw-r--r-- | net/ipv4/fib_trie.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 214c34732e84..c331c433acf2 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c | |||
@@ -350,11 +350,10 @@ static void __tnode_free_rcu(struct rcu_head *head) | |||
350 | 350 | ||
351 | static inline void tnode_free(struct tnode *tn) | 351 | static inline void tnode_free(struct tnode *tn) |
352 | { | 352 | { |
353 | if(IS_LEAF(tn)) { | 353 | if (IS_LEAF(tn)) { |
354 | struct leaf *l = (struct leaf *) tn; | 354 | struct leaf *l = (struct leaf *) tn; |
355 | call_rcu_bh(&l->rcu, __leaf_free_rcu); | 355 | call_rcu_bh(&l->rcu, __leaf_free_rcu); |
356 | } | 356 | } else |
357 | else | ||
358 | call_rcu(&tn->rcu, __tnode_free_rcu); | 357 | call_rcu(&tn->rcu, __tnode_free_rcu); |
359 | } | 358 | } |
360 | 359 | ||
@@ -553,7 +552,7 @@ static struct node *resize(struct trie *t, struct tnode *tn) | |||
553 | 552 | ||
554 | /* Keep root node larger */ | 553 | /* Keep root node larger */ |
555 | 554 | ||
556 | if(!tn->parent) | 555 | if (!tn->parent) |
557 | inflate_threshold_use = inflate_threshold_root; | 556 | inflate_threshold_use = inflate_threshold_root; |
558 | else | 557 | else |
559 | inflate_threshold_use = inflate_threshold; | 558 | inflate_threshold_use = inflate_threshold; |
@@ -584,7 +583,7 @@ static struct node *resize(struct trie *t, struct tnode *tn) | |||
584 | 583 | ||
585 | /* Keep root node larger */ | 584 | /* Keep root node larger */ |
586 | 585 | ||
587 | if(!tn->parent) | 586 | if (!tn->parent) |
588 | halve_threshold_use = halve_threshold_root; | 587 | halve_threshold_use = halve_threshold_root; |
589 | else | 588 | else |
590 | halve_threshold_use = halve_threshold; | 589 | halve_threshold_use = halve_threshold; |
@@ -2039,12 +2038,12 @@ static struct node *fib_trie_get_first(struct fib_trie_iter *iter, | |||
2039 | { | 2038 | { |
2040 | struct node *n ; | 2039 | struct node *n ; |
2041 | 2040 | ||
2042 | if(!t) | 2041 | if (!t) |
2043 | return NULL; | 2042 | return NULL; |
2044 | 2043 | ||
2045 | n = rcu_dereference(t->trie); | 2044 | n = rcu_dereference(t->trie); |
2046 | 2045 | ||
2047 | if(!iter) | 2046 | if (!iter) |
2048 | return NULL; | 2047 | return NULL; |
2049 | 2048 | ||
2050 | if (n) { | 2049 | if (n) { |
@@ -2084,7 +2083,7 @@ static void trie_collect_stats(struct trie *t, struct trie_stat *s) | |||
2084 | int i; | 2083 | int i; |
2085 | 2084 | ||
2086 | s->tnodes++; | 2085 | s->tnodes++; |
2087 | if(tn->bits < MAX_STAT_DEPTH) | 2086 | if (tn->bits < MAX_STAT_DEPTH) |
2088 | s->nodesizes[tn->bits]++; | 2087 | s->nodesizes[tn->bits]++; |
2089 | 2088 | ||
2090 | for (i = 0; i < (1<<tn->bits); i++) | 2089 | for (i = 0; i < (1<<tn->bits); i++) |
@@ -2250,7 +2249,7 @@ static inline const char *rtn_scope(enum rt_scope_t s) | |||
2250 | { | 2249 | { |
2251 | static char buf[32]; | 2250 | static char buf[32]; |
2252 | 2251 | ||
2253 | switch(s) { | 2252 | switch (s) { |
2254 | case RT_SCOPE_UNIVERSE: return "universe"; | 2253 | case RT_SCOPE_UNIVERSE: return "universe"; |
2255 | case RT_SCOPE_SITE: return "site"; | 2254 | case RT_SCOPE_SITE: return "site"; |
2256 | case RT_SCOPE_LINK: return "link"; | 2255 | case RT_SCOPE_LINK: return "link"; |