packets: Add eth_addr_compare_3way function.

This commit adds eth_addr_compare_3way() which behaves like memcmp
for Ethernet addresses.

diff --git a/lib/packets.h b/lib/packets.h
index 3ff3babf0457dfd9358a1fefcb719202cff8b130..38f98fb08e7b892d5e33193d10626febf10fd3e0 100644 (file)
--- a/lib/packets.h
+++ b/lib/packets.h
@@ -60,10 +60,15 @@ static inline bool eth_addr_is_zero(const uint8_t ea[6])
 {
     return !(ea[0] | ea[1] | ea[2] | ea[3] | ea[4] | ea[5]);
 }
+static inline int eth_addr_compare_3way(const uint8_t a[ETH_ADDR_LEN],
+                                        const uint8_t b[ETH_ADDR_LEN])
+{
+    return memcmp(a, b, ETH_ADDR_LEN);
+}
 static inline bool eth_addr_equals(const uint8_t a[ETH_ADDR_LEN],
                                    const uint8_t b[ETH_ADDR_LEN])
 {
-    return !memcmp(a, b, ETH_ADDR_LEN);
+    return !eth_addr_compare_3way(a, b);
 }
 static inline uint64_t eth_addr_to_uint64(const uint8_t ea[ETH_ADDR_LEN])
 {

diff --git a/ofproto/in-band.c b/ofproto/in-band.c
index be4a7e89b22b30fd543bb563b4bb3b6aab80c4ff..952ff8b152566e4c7ecb631f169f2ef4758bc4c7 100644 (file)
--- a/ofproto/in-band.c
+++ b/ofproto/in-band.c
@@ -641,7 +641,7 @@ compare_addrs(const void *a_, const void *b_)
 static int
 compare_macs(const void *a, const void *b)
 {
-    return memcmp(a, b, ETH_ADDR_LEN);
+    return eth_addr_compare_3way(a, b);
 }
 
 void

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index fab619470fd3415cbb43bd58a60ddcab1a3f4710..3637ec655b527c7cf836752e93437e4939e915cd 100644 (file)
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -1000,7 +1000,7 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN],
             !eth_addr_is_local(iface_ea) &&
             !eth_addr_is_reserved(iface_ea) &&
             !eth_addr_is_zero(iface_ea) &&
-            memcmp(iface_ea, ea, ETH_ADDR_LEN) < 0)
+            eth_addr_compare_3way(iface_ea, ea) < 0)
         {
             memcpy(ea, iface_ea, ETH_ADDR_LEN);
             *hw_addr_iface = iface;