Skip to content

Commit

Permalink
batman-adv: use batadv_compare_eth when possible
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Antonio Quartulli committed May 10, 2016
1 parent 9d1601e commit 676970e
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions net/batman-adv/network-coding.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 676970e

Please sign in to comment.