projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
device: preserve orig_settings flags for querying device status
[project/netifd.git]
/
device.c
diff --git
a/device.c
b/device.c
index
a29c981
..
67e9d9a
100644
(file)
--- 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