2 files changed, 1 insertions, 1 deletions
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 913685a4..8a6b2f02 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1181,6 +1181,7 @@ bgp_start(struct proto *P)
   lock->addr = p->cf->remote_ip;
   lock->port = p->cf->remote_port;
   lock->iface = p->cf->iface;
+  lock->vrf = p->cf->iface ? NULL : p->p.vrf;
   lock->type = OBJLOCK_TCP;
   lock->hook = bgp_start_locked;
   lock->data = p;
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index 227c8ef6..c53a0a95 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -321,7 +321,6 @@ radv_iface_new(struct radv_proto *p, struct iface *iface, struct radv_iface_conf
   ifa->timer = tm;
 
   struct object_lock *lock = olock_new(pool);
-  lock->addr = IPA_NONE;
   lock->type = OBJLOCK_IP;
   lock->port = ICMPV6_PROTO;
   lock->iface = iface;