From 9b2a34c97843293da62e85940d411a1dedca284a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 7 Dec 2015 14:51:02 +0100 Subject: [PATCH] route-manager: always flush IPv6 routes during nm_route_manager_route_flush() --- src/nm-route-manager.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/nm-route-manager.c b/src/nm-route-manager.c index 18781c6918..5af0b9175c 100644 --- a/src/nm-route-manager.c +++ b/src/nm-route-manager.c @@ -941,8 +941,11 @@ nm_route_manager_ip6_route_sync (NMRouteManager *self, int ifindex, const GArray gboolean nm_route_manager_route_flush (NMRouteManager *self, int ifindex) { - return nm_route_manager_ip4_route_sync (self, ifindex, NULL, FALSE, TRUE) - && nm_route_manager_ip6_route_sync (self, ifindex, NULL, FALSE, TRUE); + bool success = TRUE; + + success &= (bool) nm_route_manager_ip4_route_sync (self, ifindex, NULL, FALSE, TRUE); + success &= (bool) nm_route_manager_ip6_route_sync (self, ifindex, NULL, FALSE, TRUE); + return success; } /*********************************************************************************************/