OSDN Git Service

batman-adv: use batadv_compare_eth when possible
authorAntonio Quartulli <a@unstable.cc>
Fri, 11 Mar 2016 13:01:10 +0000 (14:01 +0100)
committerAntonio Quartulli <a@unstable.cc>
Tue, 10 May 2016 10:28:54 +0000 (18:28 +0800)
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>
net/batman-adv/network-coding.c

index df5ae9c..678f068 100644 (file)
@@ -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;