diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-12-07 14:51:02 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-12-07 15:23:27 +0100 |
| commit | 9b2a34c97843293da62e85940d411a1dedca284a (patch) | |
| tree | ad7707fab666b141b17b580a9825f55f5fa01cb9 | |
| parent | 0a6cca945099b2b91cea2a7eb763ab44dd4129df (diff) | |
| download | NetworkManager-9b2a34c97843293da62e85940d411a1dedca284a.tar.gz | |
route-manager: always flush IPv6 routes during nm_route_manager_route_flush()
| -rw-r--r-- | src/nm-route-manager.c | 7 |
1 files 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; } /*********************************************************************************************/ |