fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 19:18:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: don't pass void* pointer to NM_DEVICE_GET_PRIVATE()

Browse source
This commit is contained in:
Thomas Haller 2015-12-07 16:34:48 +01:00
parent 14bb9419a0
commit 229ea4547c
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/devices/nm-device.c
View file

@ -3019,9 +3019,14 @@ nm_device_can_assume_active_connection (NMDevice *self)
} }
static gboolean static gboolean
nm_device_emit_recheck_assume (gpointer self) nm_device_emit_recheck_assume (gpointer user_data)
{ {
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevice *self = user_data;
NMDevicePrivate *priv;
g_return_val_if_fail (NM_IS_DEVICE (self), G_SOURCE_REMOVE);
priv = NM_DEVICE_GET_PRIVATE (self);
priv->recheck_assume_id = 0; priv->recheck_assume_id = 0;
if (!nm_device_get_act_request (self)) { if (!nm_device_get_act_request (self)) {
@ -6389,10 +6394,14 @@ send_arps (NMDevice *self, const char *mode_arg)
} }
static gboolean static gboolean
arp_announce_round2 (gpointer self) arp_announce_round2 (gpointer user_data)
{ {
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevice *self = user_data;
NMDevicePrivate *priv;
g_return_val_if_fail (NM_IS_DEVICE (self), G_SOURCE_REMOVE);
priv = NM_DEVICE_GET_PRIVATE (self);
priv->arp_round2_id = 0; priv->arp_round2_id = 0;
if ( priv->state >= NM_DEVICE_STATE_IP_CONFIG if ( priv->state >= NM_DEVICE_STATE_IP_CONFIG