New upstream version 1.9.90 upstream/1.9.90

1 files changed, 5 insertions, 17 deletions

diff --git a/src/nm-netns.c b/src/nm-netns.c
index a81aa696..96ab2b35 100644
--- a/src/nm-netns.c
+++ b/src/nm-netns.c
@@ -22,10 +22,10 @@
 
 #include "nm-netns.h"
 
+#include "nm-utils/nm-dedup-multi.h"
+
 #include "platform/nm-platform.h"
 #include "platform/nmp-netns.h"
-#include "nm-route-manager.h"
-#include "nm-default-route-manager.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 
@@ -38,8 +38,6 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE (
 typedef struct {
 	NMPlatform *platform;
 	NMPNetns *platform_netns;
-	NMRouteManager *route_manager;
-	NMDefaultRouteManager *default_route_manager;
 	bool log_with_ptr;
 } NMNetnsPrivate;
 
@@ -74,16 +72,10 @@ nm_netns_get_platform (NMNetns *self)
 	return NM_NETNS_GET_PRIVATE (self)->platform;
 }
 
-NMDefaultRouteManager *
-nm_netns_get_default_route_manager (NMNetns *self)
-{
-	return NM_NETNS_GET_PRIVATE (self)->default_route_manager;
-}
-
-NMRouteManager *
-nm_netns_get_route_manager (NMNetns *self)
+NMDedupMultiIndex *
+nm_netns_get_multi_idx (NMNetns *self)
 {
-	return NM_NETNS_GET_PRIVATE (self)->route_manager;
+	return nm_platform_get_multi_idx (NM_NETNS_GET_PRIVATE (self)->platform);
 }
 
 /*****************************************************************************/
@@ -129,8 +121,6 @@ constructed (GObject *object)
 	log_with_ptr = nm_platform_get_log_with_ptr (priv->platform);
 
 	priv->platform_netns = nm_platform_netns_get (priv->platform);
-	priv->route_manager = nm_route_manager_new (log_with_ptr, priv->platform);
-	priv->default_route_manager = nm_default_route_manager_new (log_with_ptr, priv->platform);
 
 	G_OBJECT_CLASS (nm_netns_parent_class)->constructed (object);
 }
@@ -149,8 +139,6 @@ dispose (GObject *object)
 	NMNetns *self = NM_NETNS (object);
 	NMNetnsPrivate *priv = NM_NETNS_GET_PRIVATE (self);
 
-	g_clear_object (&priv->route_manager);
-	g_clear_object (&priv->default_route_manager);
 	g_clear_object (&priv->platform);
 
 	G_OBJECT_CLASS (nm_netns_parent_class)->dispose (object);