---

yaml --- r: 327392 b: refs/heads/master c: 79cda75 h: refs/heads/master v: v3
git-mirror · Aug 7, 2012 · 2ffe864 · 2ffe864
1 parent 3ceb893
commit 2ffe864
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 425f09ab7d1c9da6ca4137dd639cb6fe3f8a88f3
+refs/heads/master: 79cda75a107da0d49732b5cb642b456264dd7e0e
diff --git a/trunk/net/ipv4/fib_trie.c b/trunk/net/ipv4/fib_trie.c
@@ -1550,7 +1550,8 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
 		 * state.directly.
 		 */
 		if (pref_mismatch) {
-			int mp = KEYLENGTH - fls(pref_mismatch);
+			/* fls(x) = __fls(x) + 1 */
+			int mp = KEYLENGTH - __fls(pref_mismatch) - 1;
 
 			if (tkey_extract_bits(cn->key, mp, cn->pos - mp) != 0)
 				goto backtrace;