From: YOSHIFUJI Hideaki / 吉藤英明 Date: Sun, 20 Jan 2013 07:38:52 +0000 (+0000) Subject: ipv6: Optimize ipv6_addr_is_ll_all_{nodes,routers}(). X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d1641565f6926c2e9f5859d81bc6f72fc0e1ad76;p=openwrt%2Fstaging%2Fblogic.git ipv6: Optimize ipv6_addr_is_ll_all_{nodes,routers}(). Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller --- diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 9dc5efc3b0d6..6c58d507123f 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -288,16 +288,26 @@ static inline bool ipv6_addr_is_multicast(const struct in6_addr *addr) static inline bool ipv6_addr_is_ll_all_nodes(const struct in6_addr *addr) { +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 + __u64 *p = (__u64 *)addr; + return ((p[0] ^ cpu_to_be64(0xff02000000000000UL)) | (p[1] ^ cpu_to_be64(1))) == 0UL; +#else return ((addr->s6_addr32[0] ^ htonl(0xff020000)) | addr->s6_addr32[1] | addr->s6_addr32[2] | (addr->s6_addr32[3] ^ htonl(0x00000001))) == 0; +#endif } static inline bool ipv6_addr_is_ll_all_routers(const struct in6_addr *addr) { +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 + __u64 *p = (__u64 *)addr; + return ((p[0] ^ cpu_to_be64(0xff02000000000000UL)) | (p[1] ^ cpu_to_be64(2))) == 0UL; +#else return ((addr->s6_addr32[0] ^ htonl(0xff020000)) | addr->s6_addr32[1] | addr->s6_addr32[2] | (addr->s6_addr32[3] ^ htonl(0x00000002))) == 0; +#endif } static inline bool ipv6_addr_is_isatap(const struct in6_addr *addr)