From f90e1549aeddd97fa061fb95c52b1168c69fae4c Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 14 Jul 2015 11:47:51 +0200 Subject: [PATCH] platform: don't assert there's no parent-parent loops http://www.spinics.net/lists/netdev/msg314907.html (cherry picked from commit 4aac263b0d88f29cd0a3191a4eb08d48c7947222) --- src/platform/nm-platform.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 05accd36c2..2bacdff407 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -506,11 +506,11 @@ nm_platform_link_get_all (NMPlatform *self) } if (!found_something) { - /* there is a circle, pop the first (remaining) element from the list */ + /* There is a loop, pop the first (remaining) element from the list. + * This can happen for veth pairs where each peer is parent of the other end. */ item = &g_array_index (links, NMPlatformLink, first_idx); - _LOGT ("link-get: add (circle) %3d -> %3d: %s", first_idx, j, nm_platform_link_to_string (item)); - g_warn_if_reached (); + _LOGT ("link-get: add (loop) %3d -> %3d: %s", first_idx, j, nm_platform_link_to_string (item)); g_hash_table_remove (unseen, GINT_TO_POINTER (item->ifindex)); g_array_index (result, NMPlatformLink, j++) = *item;