Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 90615
b: refs/heads/master
c: ef3660c
h: refs/heads/master
i:
  90613: 4b8e680
  90611: 8180c74
  90607: 370b245
v: v3
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Apr 10, 2008
1 parent 861752c commit 904c314
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2e1e9848accba7e5f6a731bf0d0fc2c84f3ee748
refs/heads/master: ef3660ce0649fa10265455f539b72607cff53d02
8 changes: 4 additions & 4 deletions trunk/net/ipv4/fib_trie.c
Original file line number Diff line number Diff line change
Expand Up @@ -1670,7 +1670,7 @@ static int fn_trie_delete(struct fib_table *tb, struct fib_config *cfg)
return 0;
}

static int trie_flush_list(struct trie *t, struct list_head *head)
static int trie_flush_list(struct list_head *head)
{
struct fib_alias *fa, *fa_node;
int found = 0;
Expand All @@ -1688,15 +1688,15 @@ static int trie_flush_list(struct trie *t, struct list_head *head)
return found;
}

static int trie_flush_leaf(struct trie *t, struct leaf *l)
static int trie_flush_leaf(struct leaf *l)
{
int found = 0;
struct hlist_head *lih = &l->list;
struct hlist_node *node, *tmp;
struct leaf_info *li = NULL;

hlist_for_each_entry_safe(li, node, tmp, lih, hlist) {
found += trie_flush_list(t, &li->falh);
found += trie_flush_list(&li->falh);

if (list_empty(&li->falh)) {
hlist_del_rcu(&li->hlist);
Expand Down Expand Up @@ -1787,7 +1787,7 @@ static int fn_trie_flush(struct fib_table *tb)
int found = 0;

for (l = trie_firstleaf(t); l; l = trie_nextleaf(l)) {
found += trie_flush_leaf(t, l);
found += trie_flush_leaf(l);

if (ll && hlist_empty(&ll->list))
trie_leaf_remove(t, ll);
Expand Down

0 comments on commit 904c314

Please sign in to comment.