diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-01 01:10:03 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-01 01:10:03 +0100 |
commit | 5b4704419cbd0b7597a91c19f9e8e8b17c1af071 (patch) | |
tree | 94ee46905ba2a142bdf910fb26f7450c41ebc46a /net/ipv4/fib_semantics.c | |
parent | Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge (diff) | |
download | linux-5b4704419cbd0b7597a91c19f9e8e8b17c1af071.tar.xz linux-5b4704419cbd0b7597a91c19f9e8e8b17c1af071.zip |
ipv4: Remember FIB alias list head and table in lookup results.
This will be used later to implement fib_select_default() in a
completely generic manner, instead of the current situation where the
default route is re-looked up in the TRIE/HASH table and then the
available aliases are analyzed.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_semantics.c')
-rw-r--r-- | net/ipv4/fib_semantics.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index 48e93a560077..1bf6fb906cfc 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -889,8 +889,9 @@ failure: } /* Note! fib_semantic_match intentionally uses RCU list functions. */ -int fib_semantic_match(struct list_head *head, const struct flowi *flp, - struct fib_result *res, int prefixlen, int fib_flags) +int fib_semantic_match(struct fib_table *tb, struct list_head *head, + const struct flowi *flp, struct fib_result *res, + int prefixlen, int fib_flags) { struct fib_alias *fa; int nh_sel = 0; @@ -954,6 +955,8 @@ out_fill_res: res->type = fa->fa_type; res->scope = fa->fa_scope; res->fi = fa->fa_info; + res->table = tb; + res->fa_head = head; if (!(fib_flags & FIB_LOOKUP_NOREF)) atomic_inc(&res->fi->fib_clntref); return 0; |