commit 1689380b8bfe1b8264463e78130bb7f94673e590
author William A. Kennington III <wak@google.com> Wed Jan 30 16:01:01 2019 -0800
committer William A. Kennington III <wak@google.com> Thu Feb 14 12:10:12 2019 -0800
tree ff193f7e14eef487fbfc1952b296cc6eed34cf4f
parent a14879e1f4d5ea2caa1cfccf02727974501d577f

ethernet_interface: Link local IPs are never DHCP

The concept of an interface having a link local IP is orthogonal to DHCP
vs static addressing and we should never be receiving a link local IP
over DHCP.

Change-Id: I80040054f8c9acad3d3d0afa12c5738b43957a4a
Signed-off-by: William A. Kennington III <wak@google.com>

ethernet_interface.cpp

diff --git a/ethernet_interface.cpp b/ethernet_interface.cpp
index 94bfecd..e7da8ff 100644
--- a/ethernet_interface.cpp
+++ b/ethernet_interface.cpp
@@ -86,7 +86,7 @@
         {
             origin = IP::AddressOrigin::DHCP;
         }
-        else if (isLinkLocalIP(addr.ipaddress))
+        if (isLinkLocalIP(addr.ipaddress))
         {
             origin = IP::AddressOrigin::LinkLocal;
         }