summaryrefslogtreecommitdiffhomepage
path: root/device.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-11-17 15:05:01 +0100
committerFelix Fietkau <nbd@openwrt.org>2015-11-17 15:05:01 +0100
commit5a0328c7b039a90e988aaab8e03eb8ce5508d62b (patch)
tree35e3269c90e51aaef1444c10581ed7f1c3cc7725 /device.c
parentebd3d8417c7a08c03de2d38e8f43422428dd4094 (diff)
device: preserve orig_settings flags for querying device status
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Diffstat (limited to 'device.c')
-rw-r--r--device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/device.c b/device.c
index a29c981..67e9d9a 100644
--- a/device.c
+++ b/device.c
@@ -174,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