Repository : ssh://git@open-mesh.org/batman-adv

On branch : next

commit 91890af1caaa170e09a5051c0c51db1ddb493f34 Author: Antonio Quartulli antonio@meshcoding.com Date: Tue Dec 10 19:39:00 2013 +0100

batadv: Slight optimization of batadv_compare_eth

Use the newly added generic routine ether_addr_equal_unaligned to test if possibly unaligned to u16 Ethernet addresses are equal.

This slightly improves comparison time for systems with CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS.

Signed-off-by: Joe Perches joe@perches.com [antonio@meshcoding.com: added compat code for linux <3.14] Signed-off-by: Antonio Quartulli antonio@meshcoding.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

91890af1caaa170e09a5051c0c51db1ddb493f34 compat.h | 6 ++++++ main.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/compat.h b/compat.h index 04a2256..997b817 100644 --- a/compat.h +++ b/compat.h @@ -376,4 +376,10 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ }) #endif /* < KERNEL_VERSION(3, 11, 0) */

+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) + +#define ether_addr_equal_unaligned(_a, _b) (memcmp(_a, _b, ETH_ALEN) == 0) + +#endif /* < KERNEL_VERSION(3, 14, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/main.h b/main.h index c5d6eb2..d4187ba 100644 --- a/main.h +++ b/main.h @@ -267,7 +267,7 @@ static inline void batadv_dbg(int type __always_unused, */ static inline int batadv_compare_eth(const void *data1, const void *data2) { - return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); + return ether_addr_equal_unaligned(data1, data2); }

/**