Merge v2.0.12 into thread-next

diff --cc proto/babel/babel.c
index a00be9a597cb811b40c5656631960393d98c419d,ff8b6b52ef4a3f3c06f1447ec452c246d2841716..a3a52f73715537a9929b5775e8baaeaeb413822c
--- 1/proto/babel/babel.c
--- 2/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@@ -1945,6 -1946,9 +1945,9 @@@ babel_reconfigure_ifaces(struct babel_p
  
    WALK_LIST(iface, iface_list)
    {
 -    if (p->p.vrf_set && p->p.vrf != iface->master)
++    if (p->p.vrf && p->p.vrf != iface->master)
+       continue;
+ 
      if (!(iface->flags & IF_UP))
        continue;
  

diff --cc proto/bfd/packets.c
Simple merge

diff --cc proto/ospf/iface.c
index 4cd4503318ec1f96bcd6a7ae5735c18bae9f1f84,87e3d95eb6aecbd8ab06b66216dc06c9b39c5cb7..84c53aa138440a1538c56035a22ae3b9c764cdeb
--- 1/proto/ospf/iface.c
--- 2/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@@ -1227,6 -1227,9 +1227,9 @@@ ospf_reconfigure_ifaces2(struct ospf_pr
  
    WALK_LIST(iface, iface_list)
    {
 -    if (p->p.vrf_set && p->p.vrf != iface->master)
++    if (p->p.vrf && p->p.vrf != iface->master)
+       continue;
+ 
      if (! (iface->flags & IF_UP))
        continue;
  
@@@ -1273,6 -1276,9 +1276,9 @@@ ospf_reconfigure_ifaces3(struct ospf_pr
  
    WALK_LIST(iface, iface_list)
    {
 -    if (p->p.vrf_set && p->p.vrf != iface->master)
++    if (p->p.vrf && p->p.vrf != iface->master)
+       continue;
+ 
      if (! (iface->flags & IF_UP))
        continue;
  

diff --cc proto/radv/radv.c
index 10d5e3ed23ca807da546149f55ab7383f2f9826a,119a8dc41c980d4cfe9209c1b2757a84cd3507ae..8929e8ef821b0d9fa38ffde822e977301aba374b
--- 1/proto/radv/radv.c
--- 2/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@@ -666,6 -663,9 +666,9 @@@ radv_reconfigure(struct proto *P, struc
    struct iface *iface;
    WALK_LIST(iface, iface_list)
    {
 -    if (p->p.vrf_set && p->p.vrf != iface->master)
++    if (p->p.vrf && p->p.vrf != iface->master)
+       continue;
+ 
      if (!(iface->flags & IF_UP))
        continue;
  

diff --cc proto/rip/rip.c
index 5981ffa79ace2d58c66636828c778b80c354a3f6,8c2d5aebdee75829b13e0d8895b027f89552d515..bd087246bb37bdcfa526dd561bd729ba4df86ee2
--- 1/proto/rip/rip.c
--- 2/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@@ -808,6 -797,9 +808,9 @@@ rip_reconfigure_ifaces(struct rip_prot
  
    WALK_LIST(iface, iface_list)
    {
 -    if (p->p.vrf_set && p->p.vrf != iface->master)
++    if (p->p.vrf && p->p.vrf != iface->master)
+       continue;
+ 
      if (!(iface->flags & IF_UP))
        continue;