X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=67e9d9ac63624b9d657176240f61e0f5c2f40187;hp=21b436f9dbd2c2e665d5a2fcec9571d71aab4dab;hb=5a0328c7b039a90e988aaab8e03eb8ce5508d62b;hpb=3224b809c359107b04c067cc00e652729030c735

diff --git a/device.c b/device.c
index 21b436f..67e9d9a 100644
--- a/device.c
+++ b/device.c
@@ -74,15 +74,14 @@ void device_unlock(void)
 static int set_device_state(struct device *dev, bool state)
 {
 	if (state) {
-		/* Set ifindex for all devices being enabled so a valid  */
+		/* Get ifindex for all devices being enabled so a valid  */
 		/* ifindex is in place avoiding possible race conditions */
 		device_set_ifindex(dev, system_if_resolve(dev));
 		if (!dev->ifindex)
 			return -1;
-	}
 
-	if (state)
 		system_if_up(dev);
+	}
 	else
 		system_if_down(dev);
 
@@ -175,7 +174,7 @@ device_merge_settings(struct device *dev, struct device_settings *n)
 		s->dadtransmits : os->dadtransmits;
 	n->multicast_to_unicast = s->multicast_to_unicast;
 	n->multicast_router = s->multicast_router;
-	n->flags = s->flags | os->flags;
+	n->flags = s->flags | os->flags | os->valid_flags;
 }
 
 void
@@ -332,7 +331,13 @@ int device_claim(struct device_user *dep)
 		return 0;
 
 	device_broadcast_event(dev, DEV_EVENT_SETUP);
-	if (!dev->external)
+	if (dev->external) {
+		/* Get ifindex for external claimed devices so a valid   */
+		/* ifindex is in place avoiding possible race conditions */
+		device_set_ifindex(dev, system_if_resolve(dev));
+		if (!dev->ifindex)
+			ret = -1;
+	} else
 		ret = dev->set_state(dev, true);
 
 	if (ret == 0)