Add forgotten fields to merge_ifconf.

8517895e · Juliusz Chroboczek · bf89505a · 8517895e
Commit 8517895e authored Jun 12, 2013 by Juliusz Chroboczek
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

configuration.c configuration.c +2 -0

No files found.
--- a/configuration.c
+++ b/configuration.c
@@ -524,6 +524,8 @@ merge_ifconf(struct interface_conf *dest, struct interface_conf *src)
    MERGE(wired);
    MERGE(split_horizon);
    MERGE(lq);
+    MERGE(faraway);
+    MERGE(channel);

 #undef MERGE
 }