zebra: do not read speed if underlying vrf not ready

if interface is created at config, but the underlying vrf is not ready, then prevent from reading speed and updating the client with that. Signed-off-by: Philippe Guibert <[email protected]>
FRRouting · Dec 15, 2021 · eecda3e · eecda3e
1 parent 4b40dcd
commit eecda3e
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/zebra/interface.c b/zebra/interface.c
@@ -74,7 +74,10 @@ static int if_zebra_speed_update(struct thread *thread)
 
 	zif->speed_update = NULL;
 
-	new_speed = kernel_get_speed(ifp, &error);
+	if (ifp->vrf_id == VRF_UNKNOWN)
+		error = INTERFACE_SPEED_ERROR_READ;
+	else
+		new_speed = kernel_get_speed(ifp, &error);
 
 	/* error may indicate vrf not available or
 	 * interfaces not available.
@@ -83,16 +86,14 @@ static int if_zebra_speed_update(struct thread *thread)
 	if (error == INTERFACE_SPEED_ERROR_READ)
 		return 1;
 
-	if (new_speed != ifp->speed) {
+	if (new_speed != ifp->speed && !error) {
 		zlog_info("%s: %s old speed: %u new speed: %u", __func__,
 			  ifp->name, ifp->speed, new_speed);
-		if (error == INTERFACE_SPEED_ERROR_UNKNOWN)
-			ifp->speed = 0;
-		else
-			ifp->speed = new_speed;
+		ifp->speed = new_speed;
 		if_add_update(ifp);
 		changed = true;
-	}
+	} else if (error == INTERFACE_SPEED_ERROR_UNKNOWN)
+			ifp->speed = 0;
 
 	if (changed || error == INTERFACE_SPEED_ERROR_UNKNOWN)
 		thread_add_timer(zrouter.master, if_zebra_speed_update, ifp, 5,