From 904c314627867c7479071fdb7be5df9beb1f853f Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 10 Apr 2008 03:46:12 -0700 Subject: [PATCH] --- yaml --- r: 90615 b: refs/heads/master c: ef3660ce0649fa10265455f539b72607cff53d02 h: refs/heads/master i: 90613: 4b8e680d88208c8a2c973cea692ed2229fb4087b 90611: 8180c74f5295821e34271a665e2e90515b265df4 90607: 370b2457e7bda9ec0ed906d131d6cdbd452cd61e v: v3 --- [refs] | 2 +- trunk/net/ipv4/fib_trie.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 72dd0e137e83..35fffcc584e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e1e9848accba7e5f6a731bf0d0fc2c84f3ee748 +refs/heads/master: ef3660ce0649fa10265455f539b72607cff53d02 diff --git a/trunk/net/ipv4/fib_trie.c b/trunk/net/ipv4/fib_trie.c index 64a274282042..595a2eedb2dc 100644 --- a/trunk/net/ipv4/fib_trie.c +++ b/trunk/net/ipv4/fib_trie.c @@ -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; @@ -1688,7 +1688,7 @@ 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; @@ -1696,7 +1696,7 @@ static int trie_flush_leaf(struct trie *t, struct leaf *l) 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); @@ -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);