Remove the pseudo interface created for prefix delegation and mix different

IA options in one DHCP state as recommended by RFC 7550.

Hopefully this will simplify support a great deal.

1 files changed, 2 insertions, 12 deletions

diff --git a/if.c b/if.c
index 2f1a7e57..201cc48c 100644
--- a/if.c
+++ b/if.c
@@ -548,13 +548,11 @@ if_findindexname(struct if_head *ifaces, unsigned int idx, const char *name)
 		struct interface *ifp;
 
 		TAILQ_FOREACH(ifp, ifaces, next) {
-			if ((ifp->options == NULL ||
-			    !(ifp->options->options & DHCPCD_PFXDLGONLY)) &&
-			    ((name && strcmp(ifp->name, name) == 0) ||
+			if ((name && strcmp(ifp->name, name) == 0) ||
 #ifdef __linux__
 			    (name && strcmp(ifp->alias, name) == 0) ||
 #endif
-			    (!name && ifp->index == idx)))
+			    (!name && ifp->index == idx))
 				return ifp;
 		}
 	}
@@ -603,14 +601,6 @@ if_cmp(const struct interface *si, const struct interface *ti)
 	int r;
 #endif
 
-	/* Always prefer master interfaces */
-	if (!(si->options->options & DHCPCD_PFXDLGONLY) &&
-	    ti->options->options & DHCPCD_PFXDLGONLY)
-		return -1;
-	if (si->options->options & DHCPCD_PFXDLGONLY &&
-	    !(ti->options->options & DHCPCD_PFXDLGONLY))
-		return 1;
-
 	/* Check carrier status first */
 	if (si->carrier > ti->carrier)
 		return -1;