From a07b0c29faa10816158627fce514b6b7d0bbebdd Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 19 Sep 2006 13:42:46 -0700 Subject: [PATCH] --- yaml --- r: 34011 b: refs/heads/master c: 888454c57a45511808d3fa52597b3d765df034a6 h: refs/heads/master i: 34009: 0703f00827636dde1ab5443616deef027bbb9580 34007: 47fbb3b48efa2b3c2543a0dec68f36b638e39c86 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 6c69750eef5c..194ca21af684 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b22b9004f22ba8ca33d15059e8b710a4b71ec3cc +refs/heads/master: 888454c57a45511808d3fa52597b3d765df034a6 diff --git a/trunk/net/ipv4/fib_trie.c b/trunk/net/ipv4/fib_trie.c index 23fb9d9768e3..01801c0f885d 100644 --- a/trunk/net/ipv4/fib_trie.c +++ b/trunk/net/ipv4/fib_trie.c @@ -1281,18 +1281,18 @@ static inline int check_leaf(struct trie *t, struct leaf *l, struct fib_result *res) { int err, i; - t_key mask; + __be32 mask; struct leaf_info *li; struct hlist_head *hhead = &l->list; struct hlist_node *node; hlist_for_each_entry_rcu(li, node, hhead, hlist) { i = li->plen; - mask = ntohl(inet_make_mask(i)); - if (l->key != (key & mask)) + mask = inet_make_mask(i); + if (l->key != (key & ntohl(mask))) continue; - if ((err = fib_semantic_match(&li->falh, flp, res, l->key, mask, i)) <= 0) { + if ((err = fib_semantic_match(&li->falh, flp, res, htonl(l->key), mask, i)) <= 0) { *plen = i; #ifdef CONFIG_IP_FIB_TRIE_STATS t->stats.semantic_match_passed++;