From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Wed, 9 Aug 2017 10:46:27 +0000 (+0200)
Subject: Merge branch 'master' into int-new
X-Git-Tag: v2.0.0~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69f73992477a0e29f939f9e2722f705c4ad72a38;p=thirdparty%2Fbird.git

Merge branch 'master' into int-new
---

69f73992477a0e29f939f9e2722f705c4ad72a38
diff --cc proto/radv/radv.c
index 4a6593b8a,91f9853d0..b4b1bc584
--- a/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;