diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-08-07 10:45:47 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-07 16:24:55 -0700 |
| commit | 79cda75a107da0d49732b5cb642b456264dd7e0e (patch) | |
| tree | 7cffe187b2ff7732f6002d7fc373f87cb93837b9 | |
| parent | 425f09ab7d1c9da6ca4137dd639cb6fe3f8a88f3 (diff) | |
| download | op-kernel-dev-79cda75a107da0d49732b5cb642b456264dd7e0e.zip op-kernel-dev-79cda75a107da0d49732b5cb642b456264dd7e0e.tar.gz | |
fib: use __fls() on non null argument
__fls(x) is a bit faster than fls(x), granted we know x is non null.
As Ben Hutchings pointed out, fls(x) = __fls(x) + 1
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/fib_trie.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index f0cdb30..f84a0e9 100644 --- a/net/ipv4/fib_trie.c +++ b/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; |
