summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-01-13 18:37:40 +0100
committerThomas Haller <thaller@redhat.com>2016-01-13 18:52:13 +0100
commitd7c61e085fb5a2b673a29057f61106f26526a2d2 (patch)
treed65144fb125b9216778c69c495173fbb8e3d5fbd
parent6b87ba651aefc26863b8ec3d14ee7ed1bdd92a21 (diff)
downloadNetworkManager-d7c61e085fb5a2b673a29057f61106f26526a2d2.tar.gz
fixup! device: detect duplicate IPv4 addresses when method=manual
-rw-r--r--src/devices/nm-device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 347445ea88..54d06c45da 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -3668,7 +3668,7 @@ arping_data_destroy (gpointer ptr, GClosure *closure)
for (i = 0; data->configs && data->configs[i]; i++)
g_object_unref (data->configs[i]);
g_free (data->configs);
- g_free (data);
+ g_slice_free (ArpingData, data);
}
}
@@ -3780,7 +3780,7 @@ ipv4_dad_start (NMDevice *self, NMIP4Config **configs, ArpingCallback cb)
arping_manager = nm_arping_manager_new (nm_device_get_ip_ifindex (self));
priv->arping.dad_list = g_slist_append (priv->arping.dad_list, arping_manager);
- data = g_new0 (ArpingData, 1);
+ data = g_slice_new0 (ArpingData);
data->configs = configs;
data->callback = cb;
data->device = g_object_ref (self);