From: Maria Matejka <mq@ucw.cz>
Date: Tue, 24 Jan 2023 08:45:50 +0000 (+0100)
Subject: Merge v2.0.12 into thread-next
X-Git-Tag: v3.0-alpha1~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ac628e0f0b7ffaa49c95688cc95954ece8f61fc;p=thirdparty%2Fbird.git

Merge v2.0.12 into thread-next
---

3ac628e0f0b7ffaa49c95688cc95954ece8f61fc
diff --cc proto/babel/babel.c
index a00be9a59,ff8b6b52e..a3a52f737
--- a/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/ospf/iface.c
index 4cd450331,87e3d95eb..84c53aa13
--- a/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 10d5e3ed2,119a8dc41..8929e8ef8
--- a/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 5981ffa79,8c2d5aebd..bd087246b
--- a/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;