X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-event.c;h=cfbc15c2bd5bcf3008a798949b08804e79e2e799;hp=1c8134f63421e363965a2f988458abdceba65989;hb=edb414294c06fb9d275c9f3be2282283453a46d0;hpb=08d35c7a59a182b9ef05d95ca3c583806b2ba924

diff --git a/interface-event.c b/interface-event.c
index 1c8134f..cfbc15c 100644
--- a/interface-event.c
+++ b/interface-event.c
@@ -83,7 +83,7 @@ call_hotplug(void)
 	current_ev = current->hotplug_ev;
 	list_del_init(&current->hotplug_list);
 
-	if (current_ev == IFEV_UP && current->l3_dev.dev)
+	if ((current_ev == IFEV_UP || current_ev == IFEV_UPDATE) && current->l3_dev.dev)
 		device = current->l3_dev.dev->ifname;
 
 	D(SYSTEM, "Call hotplug handler for interface '%s', event '%s' (%s)\n",
@@ -120,22 +120,11 @@ interface_queue_event(struct interface *iface, enum interface_event ev)
 	if (current == iface) {
 		/* an event for iface is being processed */
 		if (!list_empty(&iface->hotplug_list)) {
-			/* an additional event for iface is pending */
-			if ((ev != current_ev || ev == IFEV_UPDATE) &&
-			!(iface->hotplug_ev == IFEV_UP && ev == IFEV_UPDATE)) {
-				/* if incoming event is different from the one
-				 * being handled or if it is an update,
-				 * overwrite pending event, but never
-				 * overwrite an ifup with an ifupdate */
+			/* an additional event for iface is pending   */
+			/* overwrite pending event if it differs from */
+			/* an update                                  */
+			if (ev != IFEV_UPDATE)
 				iface->hotplug_ev = ev;
-			}
-			else if (ev == current_ev && ev != IFEV_UPDATE) {
-				/* if incoming event is not an ifupdate
-				 * and is the same as the one that is
-				 * being handled, remove it from the
-				 * pending list */
-				list_del_init(&iface->hotplug_list);
-			}
 		}
 		else {
 			/* no additional event for iface is pending */