From: Hans Dedecker <dedeckeh@gmail.com>
Date: Fri, 27 Nov 2015 12:34:01 +0000 (+0100)
Subject: config: Prioritize ifname resolving via ubus over ifname/networkid attributes
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=commitdiff_plain;h=045a6202903084c7053924f2cb40a95669fb139c

config: Prioritize ifname resolving via ubus over ifname/networkid attributes

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---

diff --git a/src/config.c b/src/config.c
index 4fc8bc7..74ab3dd 100644
--- a/src/config.c
+++ b/src/config.c
@@ -300,11 +300,6 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 	}
 
 	const char *ifname = NULL;
-#ifdef WITH_UBUS
-	if (overwrite || !iface->ifname[0])
-		ifname = ubus_get_ifname(name);
-#endif
-
 	if (overwrite) {
 		if ((c = tb[IFACE_ATTR_IFNAME]))
 			ifname = blobmsg_get_string(c);
@@ -312,6 +307,11 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 			ifname = blobmsg_get_string(c);
 	}
 
+#ifdef WITH_UBUS
+	if (overwrite || !iface->ifname[0])
+		ifname = ubus_get_ifname(name);
+#endif
+
 	if (!iface->ifname[0] && !ifname)
 		goto err;