X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=4662bf814f80d8e47fe147bd5400b95926ad023e;hp=ed69bef015055ffeabbb3a4aa927cb00b32cda57;hb=9d8dd091f8f336b111364ed211165b5ec9842a24;hpb=25289c946427db676d41c0fa4e6c01ade2f43b66

diff --git a/system-linux.c b/system-linux.c
index ed69bef..4662bf8 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -1033,6 +1033,8 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
 int system_if_up(struct device *dev)
 {
 	system_if_get_settings(dev, &dev->orig_settings);
+	/* Only keep orig settings based on what needs to be set */
+	dev->orig_settings.flags &= dev->settings.flags;
 	system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
 	return system_if_flags(dev->ifname, IFF_UP, 0);
 }
@@ -1040,7 +1042,6 @@ int system_if_up(struct device *dev)
 int system_if_down(struct device *dev)
 {
 	int ret = system_if_flags(dev->ifname, 0, IFF_UP);
-	dev->orig_settings.flags &= dev->settings.flags;
 	system_if_apply_settings(dev, &dev->orig_settings, dev->orig_settings.flags);
 	return ret;
 }