Skip to content

Commit

Permalink
net: ipv4: fib_trie: Don't unnecessarily search for already found fib…
Browse files Browse the repository at this point in the history
… leaf

We've already found leaf, don't search for it again. Same is for fib leaf info.

Signed-off-by: Igor Maravic <igorm@etf.rs>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Igor Maravic authored and David S. Miller committed Aug 14, 2012
1 parent 418a99a commit ad5b310
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions net/ipv4/fib_trie.c
Original file line number Diff line number Diff line change
Expand Up @@ -1656,7 +1656,12 @@ int fib_table_delete(struct fib_table *tb, struct fib_config *cfg)
if (!l)
return -ESRCH;

fa_head = get_fa_head(l, plen);
li = find_leaf_info(l, plen);

if (!li)
return -ESRCH;

fa_head = &li->falh;
fa = fib_find_alias(fa_head, tos, 0);

if (!fa)
Expand Down Expand Up @@ -1692,9 +1697,6 @@ int fib_table_delete(struct fib_table *tb, struct fib_config *cfg)
rtmsg_fib(RTM_DELROUTE, htonl(key), fa, plen, tb->tb_id,
&cfg->fc_nlinfo, 0);

l = fib_find_node(t, key);
li = find_leaf_info(l, plen);

list_del_rcu(&fa->fa_list);

if (!plen)
Expand Down

0 comments on commit ad5b310

Please sign in to comment.