pppd: Combine get_first_ethernet() and get_if_hwaddr() into one function (#207)

[ppp.git] / pppd / ipv6cp.c

diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c
index b9c96d4f0e2c2108cdb46858d1f0e0d95f01f5a6..431cb62211bff1d28de4ca8151c070199a615877 100644 (file)
--- a/pppd/ipv6cp.c
+++ b/pppd/ipv6cp.c
@@ -1068,18 +1068,10 @@ static int
 ether_to_eui64(eui64_t *p_eui64)
 {
     u_char addr[6];
-    char *if_name;
-
-    if (get_if_hwaddr(addr, devnam) < 0) {
-        if ((if_name = get_first_ethernet()) == NULL) {
-            error("no persistent id can be found");
-            return 0;
-        }
-
-        if (get_if_hwaddr(addr, if_name) < 0) {
-            error("could not obtain hardware address for %s", if_name);
-            return 0;
-        }
+
+    if (get_if_hwaddr(addr, devnam) < 0 || get_first_ether_hwaddr(addr) < 0) {
+        error("ipv6cp: no persistent id can be found");
+        return 0;
     }
 
     /*