diff options
author | Antonio Quartulli <a@unstable.cc> | 2016-03-11 08:01:10 -0500 |
---|---|---|
committer | Antonio Quartulli <a@unstable.cc> | 2016-05-10 06:28:54 -0400 |
commit | 676970e55b1033af7f0a03d4037b4d9b76327ded (patch) | |
tree | 18500aea54ca267857049b32694c961e9f6e9583 /net/batman-adv | |
parent | 9d1601ef4347b27dfa627d61ccfa9a724cc6e303 (diff) |
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.c | 6 |
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, | |||
521 | nc_path2 = data2; | 521 | nc_path2 = data2; |
522 | 522 | ||
523 | /* Return 1 if the two keys are identical */ | 523 | /* Return 1 if the two keys are identical */ |
524 | if (memcmp(nc_path1->prev_hop, nc_path2->prev_hop, | 524 | if (!batadv_compare_eth(nc_path1->prev_hop, nc_path2->prev_hop)) |
525 | sizeof(nc_path1->prev_hop)) != 0) | ||
526 | return false; | 525 | return false; |
527 | 526 | ||
528 | if (memcmp(nc_path1->next_hop, nc_path2->next_hop, | 527 | if (!batadv_compare_eth(nc_path1->next_hop, nc_path2->next_hop)) |
529 | sizeof(nc_path1->next_hop)) != 0) | ||
530 | return false; | 528 | return false; |
531 | 529 | ||
532 | return true; | 530 | return true; |