From: Roy Marples <roy@marples.name>
Date: Thu, 29 May 2014 11:12:09 +0000 (+0000)
Subject: Check naming rules before calling dev_initialized.
X-Git-Tag: v6.4.0~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b76368086cda67a399b2d5180ac4fc0c9d42fd4;p=thirdparty%2Fdhcpcd.git

Check naming rules before calling dev_initialized.
---

diff --git a/if.c b/if.c
index 0aad1f6b..f4b8c7a9 100644
--- a/if.c
+++ b/if.c
@@ -232,10 +232,6 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
 #endif
 		}
 
-		/* Ensure that the interface name has settled */
-		if (!dev_initialized(ctx, ifa->ifa_name))
-			continue;
-
 		/* It's possible for an interface to have >1 AF_LINK.
 		 * For our purposes, we use the first one. */
 		TAILQ_FOREACH(ifp, ifs, next) {
@@ -281,10 +277,13 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
 		if (ctx->ifac && i == ctx->ifac)
 			continue;
 
-		if (if_vimaster(ifa->ifa_name) == 1) {
+		/* Ensure that the interface name has settled */
+		if (!dev_initialized(ctx, p))
+			continue;
+
+		if (if_vimaster(p) == 1) {
 			syslog(argc ? LOG_ERR : LOG_DEBUG,
-				"%s: is a Virtual Interface Master, skipping",
-				ifa->ifa_name);
+			    "%s: is a Virtual Interface Master, skipping", p);
 			continue;
 		}