Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[mv-sheeva.git] / net / decnet / dn_table.c

diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c
index b66600b3f4b55de0e38bb0f86d1c72b40d00b562..99d8d3a40998ab4b5d40076786be3390e2d4fea8 100644 (file)
--- a/net/decnet/dn_table.c
+++ b/net/decnet/dn_table.c
@@ -764,7 +764,7 @@ static int dn_fib_table_flush(struct dn_fib_table *tb)
        return found;
 }
 
-static int dn_fib_table_lookup(struct dn_fib_table *tb, const struct flowi *flp, struct dn_fib_res *res)
+static int dn_fib_table_lookup(struct dn_fib_table *tb, const struct flowidn *flp, struct dn_fib_res *res)
 {
        int err;
        struct dn_zone *dz;
@@ -773,7 +773,7 @@ static int dn_fib_table_lookup(struct dn_fib_table *tb, const struct flowi *flp,
        read_lock(&dn_fib_tables_lock);
        for(dz = t->dh_zone_list; dz; dz = dz->dz_next) {
                struct dn_fib_node *f;
-               dn_fib_key_t k = dz_key(flp->fld_dst, dz);
+               dn_fib_key_t k = dz_key(flp->daddr, dz);
 
                for(f = dz_chain(k, dz); f; f = f->fn_next) {
                        if (!dn_key_eq(k, f->fn_key)) {
@@ -788,7 +788,7 @@ static int dn_fib_table_lookup(struct dn_fib_table *tb, const struct flowi *flp,
                        if (f->fn_state&DN_S_ZOMBIE)
                                continue;
 
-                       if (f->fn_scope < flp->fld_scope)
+                       if (f->fn_scope < flp->flowidn_scope)
                                continue;
 
                        err = dn_fib_semantic_match(f->fn_type, DN_FIB_INFO(f), flp, res);