Merge branch 'master' into int-new

diff --cc filter/config.Y
Simple merge

diff --cc proto/radv/radv.c
index 4a6593b8a0f6391a088b4083afdcb48c11578225,91f9853d0d4fab4cce78c256f0331dd8018c1e50..b4b1bc584f9091abbdc75e57a6751fdbf6142655
--- 1/proto/radv/radv.c
--- 2/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@@ -386,10 -370,7 +386,10 @@@ radv_reconfigure(struct proto *P, struc
     * causing nodes to temporary remove their default routes.
     */
  
 -  P->cf = c; /* radv_check_active() requires proper P->cf */
 +  if (!proto_configure_channel(P, &P->main_channel, proto_cf_main_channel(CF)))
 +    return 0;
 +
-   P->cf = CF; /* radv_check_active() requires proper p->cf */
++  P->cf = CF; /* radv_check_active() requires proper P->cf */
    p->active = radv_check_active(p);
  
    struct iface *iface;