diff options
Diffstat (limited to 'net/ipv4/fib_trie.c')
-rw-r--r-- | net/ipv4/fib_trie.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index f1005fe17898..b8d11492ef17 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c | |||
@@ -447,7 +447,6 @@ static void tnode_put_child_reorg(struct tnode *tn, int i, struct node *n, | |||
447 | 447 | ||
448 | BUG_ON(i >= 1<<tn->bits); | 448 | BUG_ON(i >= 1<<tn->bits); |
449 | 449 | ||
450 | |||
451 | /* update emptyChildren */ | 450 | /* update emptyChildren */ |
452 | if (n == NULL && chi != NULL) | 451 | if (n == NULL && chi != NULL) |
453 | tn->empty_children++; | 452 | tn->empty_children++; |
@@ -1306,7 +1305,6 @@ err: | |||
1306 | return err; | 1305 | return err; |
1307 | } | 1306 | } |
1308 | 1307 | ||
1309 | |||
1310 | /* should be called with rcu_read_lock */ | 1308 | /* should be called with rcu_read_lock */ |
1311 | static int check_leaf(struct trie *t, struct leaf *l, | 1309 | static int check_leaf(struct trie *t, struct leaf *l, |
1312 | t_key key, const struct flowi *flp, | 1310 | t_key key, const struct flowi *flp, |
@@ -1721,7 +1719,6 @@ static struct leaf *leaf_walk_rcu(struct tnode *p, struct node *c) | |||
1721 | return NULL; /* Root of trie */ | 1719 | return NULL; /* Root of trie */ |
1722 | } | 1720 | } |
1723 | 1721 | ||
1724 | |||
1725 | static struct leaf *trie_firstleaf(struct trie *t) | 1722 | static struct leaf *trie_firstleaf(struct trie *t) |
1726 | { | 1723 | { |
1727 | struct tnode *n = (struct tnode *) rcu_dereference(t->trie); | 1724 | struct tnode *n = (struct tnode *) rcu_dereference(t->trie); |
@@ -1849,7 +1846,6 @@ static int fn_trie_dump_fa(t_key key, int plen, struct list_head *fah, | |||
1849 | { | 1846 | { |
1850 | int i, s_i; | 1847 | int i, s_i; |
1851 | struct fib_alias *fa; | 1848 | struct fib_alias *fa; |
1852 | |||
1853 | __be32 xkey = htonl(key); | 1849 | __be32 xkey = htonl(key); |
1854 | 1850 | ||
1855 | s_i = cb->args[4]; | 1851 | s_i = cb->args[4]; |
@@ -1882,7 +1878,6 @@ static int fn_trie_dump_fa(t_key key, int plen, struct list_head *fah, | |||
1882 | return skb->len; | 1878 | return skb->len; |
1883 | } | 1879 | } |
1884 | 1880 | ||
1885 | |||
1886 | static int fn_trie_dump_leaf(struct leaf *l, struct fib_table *tb, | 1881 | static int fn_trie_dump_leaf(struct leaf *l, struct fib_table *tb, |
1887 | struct sk_buff *skb, struct netlink_callback *cb) | 1882 | struct sk_buff *skb, struct netlink_callback *cb) |
1888 | { | 1883 | { |
@@ -2388,7 +2383,6 @@ static int fib_trie_seq_show(struct seq_file *seq, void *v) | |||
2388 | struct leaf *l = (struct leaf *) n; | 2383 | struct leaf *l = (struct leaf *) n; |
2389 | struct leaf_info *li; | 2384 | struct leaf_info *li; |
2390 | struct hlist_node *node; | 2385 | struct hlist_node *node; |
2391 | |||
2392 | __be32 val = htonl(l->key); | 2386 | __be32 val = htonl(l->key); |
2393 | 2387 | ||
2394 | seq_indent(seq, iter->depth); | 2388 | seq_indent(seq, iter->depth); |