diff options
author | Fabio Baltieri <fabio.baltieri@linaro.org> | 2013-01-16 16:30:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-17 14:29:58 -0500 |
commit | 512613d7dde7b679597485e9335bd64e90df78fa (patch) | |
tree | d2dced33d326a9b2a75ecf095c3c4b4130bb7345 /include/net/ipv6.h | |
parent | c2a936600f78aea00d3312ea4b66a79a4619f9b4 (diff) |
ipv6: fix ipv6_prefix_equal64_half mask conversion
Fix the 64bit optimized version of ipv6_prefix_equal to convert the
bitmask to network byte order only after the bit-shift.
The bug was introduced in:
3867517 ipv6: 64bit version of ipv6_prefix_equal().
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ipv6.h')
-rw-r--r-- | include/net/ipv6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 51a068ad064b..464c6f70eca1 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
@@ -404,7 +404,7 @@ static inline bool __ipv6_prefix_equal64_half(const __be64 *a1, | |||
404 | const __be64 *a2, | 404 | const __be64 *a2, |
405 | unsigned int len) | 405 | unsigned int len) |
406 | { | 406 | { |
407 | if (len && ((*a1 ^ *a2) & cpu_to_be64(~0UL) << (64 - len))) | 407 | if (len && ((*a1 ^ *a2) & cpu_to_be64((~0UL) << (64 - len)))) |
408 | return false; | 408 | return false; |
409 | return true; | 409 | return true; |
410 | } | 410 | } |