Commit 210445b1 authored by Juliusz Chroboczek's avatar Juliusz Chroboczek

Fix merging of enable_timestamps in configurations.

Without this, later interface definitions override earlier ones
even when they don't specify a value.
parent 32f491b7
...@@ -574,6 +574,7 @@ merge_ifconf(struct interface_conf *dest, ...@@ -574,6 +574,7 @@ merge_ifconf(struct interface_conf *dest,
MERGE(lq); MERGE(lq);
MERGE(faraway); MERGE(faraway);
MERGE(channel); MERGE(channel);
MERGE(enable_timestamps);
MERGE(rtt_exponential_decay); MERGE(rtt_exponential_decay);
MERGE(rtt_min); MERGE(rtt_min);
MERGE(rtt_max); MERGE(rtt_max);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment