diff options
Diffstat (limited to 'net/ipv4/fib_trie.c')
-rw-r--r-- | net/ipv4/fib_trie.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index d07fc076bea0..febca0f1008c 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c | |||
@@ -2452,9 +2452,7 @@ struct fib_route_iter { | |||
2452 | static struct key_vector *fib_route_get_idx(struct fib_route_iter *iter, | 2452 | static struct key_vector *fib_route_get_idx(struct fib_route_iter *iter, |
2453 | loff_t pos) | 2453 | loff_t pos) |
2454 | { | 2454 | { |
2455 | struct fib_table *tb = iter->main_tb; | ||
2456 | struct key_vector *l, **tp = &iter->tnode; | 2455 | struct key_vector *l, **tp = &iter->tnode; |
2457 | struct trie *t; | ||
2458 | t_key key; | 2456 | t_key key; |
2459 | 2457 | ||
2460 | /* use cache location of next-to-find key */ | 2458 | /* use cache location of next-to-find key */ |
@@ -2462,8 +2460,6 @@ static struct key_vector *fib_route_get_idx(struct fib_route_iter *iter, | |||
2462 | pos -= iter->pos; | 2460 | pos -= iter->pos; |
2463 | key = iter->key; | 2461 | key = iter->key; |
2464 | } else { | 2462 | } else { |
2465 | t = (struct trie *)tb->tb_data; | ||
2466 | iter->tnode = t->kv; | ||
2467 | iter->pos = 0; | 2463 | iter->pos = 0; |
2468 | key = 0; | 2464 | key = 0; |
2469 | } | 2465 | } |
@@ -2504,12 +2500,12 @@ static void *fib_route_seq_start(struct seq_file *seq, loff_t *pos) | |||
2504 | return NULL; | 2500 | return NULL; |
2505 | 2501 | ||
2506 | iter->main_tb = tb; | 2502 | iter->main_tb = tb; |
2503 | t = (struct trie *)tb->tb_data; | ||
2504 | iter->tnode = t->kv; | ||
2507 | 2505 | ||
2508 | if (*pos != 0) | 2506 | if (*pos != 0) |
2509 | return fib_route_get_idx(iter, *pos); | 2507 | return fib_route_get_idx(iter, *pos); |
2510 | 2508 | ||
2511 | t = (struct trie *)tb->tb_data; | ||
2512 | iter->tnode = t->kv; | ||
2513 | iter->pos = 0; | 2509 | iter->pos = 0; |
2514 | iter->key = 0; | 2510 | iter->key = 0; |
2515 | 2511 | ||