vswitchd: Fix bug in Ethernet address selection for bridge.

This bug was introduced in the merge from the citrix branch in commit
8fef8c71 "Merge citrix into master."

Thanks to Reid for characterizing the problem.

Bug #1907.

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 25df8d48e443007c45bc45c0b160b0b8233e67b8..869d7172261f1013c98c12494db8edb1fef434e0 100644 (file)
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -741,6 +741,7 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN],
             !eth_addr_is_zero(iface_ea) &&
             memcmp(iface_ea, ea, ETH_ADDR_LEN) < 0)
         {
+            memcpy(ea, iface_ea, ETH_ADDR_LEN);
             *hw_addr_iface = iface;
         }
     }