summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-07-14 11:47:51 +0200
committerLubomir Rintel <lkundrak@v3.sk>2015-07-14 11:51:07 +0200
commit4aac263b0d88f29cd0a3191a4eb08d48c7947222 (patch)
tree79af6f99db7e600ffaff04893d8b7836ea5d7380
parent361b3456bac90971d3a6447e2e2c60557f61afd8 (diff)
downloadNetworkManager-4aac263b0d88f29cd0a3191a4eb08d48c7947222.tar.gz
platform: don't assert there's no parent-parent loops
http://www.spinics.net/lists/netdev/msg314907.html
-rw-r--r--src/platform/nm-platform.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index d940cd7482..2a7945d11d 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;