Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	net/netfilter/nf_conntrack_proto_tcp.c

1 files changed, 6 insertions, 11 deletions

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index d16ae4623be6..f155a66d6ebf 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1357,17 +1357,17 @@ static int check_leaf(struct trie *t, struct leaf *l,
                         t->stats.semantic_match_miss++;
 #endif
                 if (err <= 0)
-                        return plen;
+                        return err;
         }
 
-        return -1;
+        return 1;
 }
 
 static int fn_trie_lookup(struct fib_table *tb, const struct flowi *flp,
                           struct fib_result *res)
 {
         struct trie *t = (struct trie *) tb->tb_data;
-        int plen, ret = 0;
+        int ret;
         struct node *n;
         struct tnode *pn;
         int pos, bits;
@@ -1391,10 +1391,7 @@ static int fn_trie_lookup(struct fib_table *tb, const struct flowi *flp,
 
         /* Just a leaf? */
         if (IS_LEAF(n)) {
-                plen = check_leaf(t, (struct leaf *)n, key, flp, res);
-                if (plen < 0)
-                        goto failed;
-                ret = 0;
+                ret = check_leaf(t, (struct leaf *)n, key, flp, res);
                 goto found;
         }
 
@@ -1419,11 +1416,9 @@ static int fn_trie_lookup(struct fib_table *tb, const struct flowi *flp,
                 }
 
                 if (IS_LEAF(n)) {
-                        plen = check_leaf(t, (struct leaf *)n, key, flp, res);
-                        if (plen < 0)
+                        ret = check_leaf(t, (struct leaf *)n, key, flp, res);
+                        if (ret > 0)
                                 goto backtrace;
-
-                        ret = 0;
                         goto found;
                 }