The following commit has been merged in the master branch: commit 323813ed2b2dd6fdc3865610c3d6bb6daa5e9d33 Author: dingtianhong dingtianhong@huawei.com Date: Thu Dec 26 19:40:39 2013 +0800

batman-adv: use batadv_compare_eth for concise

It is better to use batadv_compate_eth instead of memcpy for concise style.

Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Antonio Quartulli antonio@meshcoding.com Cc: "David S. Miller" davem@davemloft.net Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Tan Xiaojun tanxiaojun@huawei.com Signed-off-by: Ding Tianhong dingtianhong@huawei.com Acked-by: Antonio Quartulli antonio@meshcoding.com Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 8ab1434..803ab4b 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -41,7 +41,7 @@ int batadv_compare_orig(const struct hlist_node *node, const void *data2) const void *data1 = container_of(node, struct batadv_orig_node, hash_entry);

- return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); + return batadv_compare_eth(data1, data2); }

/** diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 4add57d..06506e6 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -51,7 +51,7 @@ static int batadv_compare_tt(const struct hlist_node *node, const void *data2) const void *data1 = container_of(node, struct batadv_tt_common_entry, hash_entry);

- return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); + return batadv_compare_eth(data1, data2); }

/**