From ccd98ba2146ed7285e781f73f81f456d8a5a5988 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 8 Jan 2018 13:51:53 +0100 Subject: [PATCH] platform-linux: reload qdiscs and tfilters after removing them Kernel (as of 4.14) merely ACKs our RTM_DELQDISC and RTM_DELTFILTER, not bothering to signal the full RTM_DEL* message unless the removal is external to NetworkManager. https://bugzilla.redhat.com/show_bug.cgi?id=1527197 (cherry picked from commit f3b4053a91e48ba56c07d70e8ac7305e2f51924f) --- src/platform/nm-linux-platform.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 10d1a6efe..e66ab9449 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -4680,7 +4680,10 @@ do_delete_object (NMPlatform *platform, const NMPObject *obj_id, struct nl_msg * wait_for_nl_response_to_string (seq_result, s_buf, sizeof (s_buf)), log_detail); - if (NMP_OBJECT_GET_TYPE (obj_id) == NMP_OBJECT_TYPE_IP6_ADDRESS) { + if (NM_IN_SET (NMP_OBJECT_GET_TYPE (obj_id), + NMP_OBJECT_TYPE_IP6_ADDRESS, + NMP_OBJECT_TYPE_QDISC, + NMP_OBJECT_TYPE_TFILTER)) { /* In rare cases, the object is still there after we receive the ACK from * kernel. Need to refetch. * -- 2.14.3