X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=67e9d9ac63624b9d657176240f61e0f5c2f40187;hp=a29c981e334c3206e8fc1bd1d4d4987b3c8ee68e;hb=5a0328c7b039a90e988aaab8e03eb8ce5508d62b;hpb=ebd3d8417c7a08c03de2d38e8f43422428dd4094 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