summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-03-17 16:19:02 +0100
committerThomas Haller <thaller@redhat.com>2016-03-17 16:19:09 +0100
commit01732b87f6785c634d3a91c1d1e8785b95fca8aa (patch)
treea1f3cc5b45b0a61e16d43ac0733f534bc32bcc85
parentd4ca43613eeb0e20c5f9a4369150017ad206587e (diff)
downloadNetworkManager-01732b87f6785c634d3a91c1d1e8785b95fca8aa.tar.gz
rdisc: fix setting netns during consturction of NMRDisc
We obtain the netns from the platform instance that is passed in. It's wrong to set the current netns in nm_rdisc_init(). Fixes: 3ba944472853d5221ed83c369a77f80ee7305648
-rw-r--r--src/rdisc/nm-rdisc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/rdisc/nm-rdisc.c b/src/rdisc/nm-rdisc.c
index 7abcb703bf..689fe7f6f5 100644
--- a/src/rdisc/nm-rdisc.c
+++ b/src/rdisc/nm-rdisc.c
@@ -739,10 +739,6 @@ nm_rdisc_init (NMRDisc *rdisc)
{
NMRDiscPrivate *priv = NM_RDISC_GET_PRIVATE (rdisc);
- rdisc->_netns = nmp_netns_get_current ();
- if (rdisc->_netns)
- g_object_ref (rdisc->_netns);
-
rdisc->gateways = g_array_new (FALSE, FALSE, sizeof (NMRDiscGateway));
rdisc->addresses = g_array_new (FALSE, FALSE, sizeof (NMRDiscAddress));
rdisc->routes = g_array_new (FALSE, FALSE, sizeof (NMRDiscRoute));