X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fipv6cp.c;h=d80ae216814e9017e65e629aaf15d038d61e4c39;hp=11be07d5636691266d33e03e04abd4b440a2d7db;hb=f1a34da3b2f5336e4993a729e5ac2130d0e0595a;hpb=e8cd41673651e35447020bf9d98c5d6d4acd9212

diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c
index 11be07d..d80ae21 100644
--- a/pppd/ipv6cp.c
+++ b/pppd/ipv6cp.c
@@ -1070,7 +1070,7 @@ ether_to_eui64(eui64_t *p_eui64)
 {
     u_char addr[6];
 
-    if (get_if_hwaddr(addr, devnam) < 0 || get_first_ether_hwaddr(addr) < 0) {
+    if (get_if_hwaddr(addr, devnam) < 0 && get_first_ether_hwaddr(addr) < 0) {
         error("ipv6cp: no persistent id can be found");
         return 0;
     }
@@ -1107,7 +1107,7 @@ ipv6_check_options(void)
      * Persistent link-local id is only used when user has not explicitly
      * configure/hard-code the id
      */
-    if ((wo->use_persistent) && (!wo->opt_local) && (!wo->opt_remote)) {
+    if ((wo->use_persistent) && (!wo->opt_local)) {
 
 	/* 
 	 * On systems where there are no Ethernet interfaces used, there