summaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorAntonio Quartulli <a@unstable.cc>2016-03-11 14:01:10 +0100
committerAntonio Quartulli <a@unstable.cc>2016-05-10 12:28:54 +0200
commit676970e55b1033af7f0a03d4037b4d9b76327ded (patch)
tree18500aea54ca267857049b32694c961e9f6e9583 /net/batman-adv
parentbatman-adv: replace ethertype variable with ETH_P_BATMAN for readability (diff)
downloadlinux-676970e55b1033af7f0a03d4037b4d9b76327ded.tar.xz
linux-676970e55b1033af7f0a03d4037b4d9b76327ded.zip
batman-adv: use batadv_compare_eth when possible
When comparing Ethernet address it is better to use the more generic batadv_compare_eth. The latter is also optimised for architectures having a fast unaligned access. Signed-off-by: Antonio Quartulli <a@unstable.cc> [sven@narfation.org: fix conflicts with current version] Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/network-coding.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index df5ae9c7e507..678f06865312 100644
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -521,12 +521,10 @@ static bool batadv_nc_hash_compare(const struct hlist_node *node,
nc_path2 = data2;
/* Return 1 if the two keys are identical */
- if (memcmp(nc_path1->prev_hop, nc_path2->prev_hop,
- sizeof(nc_path1->prev_hop)) != 0)
+ if (!batadv_compare_eth(nc_path1->prev_hop, nc_path2->prev_hop))
return false;
- if (memcmp(nc_path1->next_hop, nc_path2->next_hop,
- sizeof(nc_path1->next_hop)) != 0)
+ if (!batadv_compare_eth(nc_path1->next_hop, nc_path2->next_hop))
return false;
return true;