diff options
| author | Fabio Baltieri | 2013-01-16 22:30:17 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-01-17 20:29:58 +0100 |
| commit | 512613d7dde7b679597485e9335bd64e90df78fa (patch) | |
| tree | d2dced33d326a9b2a75ecf095c3c4b4130bb7345 /include/net/ipv6.h | |
| parent | net: increase fragment memory usage limits (diff) | |
| download | kernel-qcow2-linux-512613d7dde7b679597485e9335bd64e90df78fa.tar.gz kernel-qcow2-linux-512613d7dde7b679597485e9335bd64e90df78fa.tar.xz kernel-qcow2-linux-512613d7dde7b679597485e9335bd64e90df78fa.zip | |
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, const __be64 *a2, unsigned int len) { - if (len && ((*a1 ^ *a2) & cpu_to_be64(~0UL) << (64 - len))) + if (len && ((*a1 ^ *a2) & cpu_to_be64((~0UL) << (64 - len)))) return false; return true; } |