diff options
| author | Michael Biebl <biebl@debian.org> | 2016-10-01 00:34:40 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-10-01 00:34:40 +0200 |
| commit | 636b831a0f663aa53b0e186d5dc44a623150d376 (patch) | |
| tree | 48ef86c0ff45c7c2c7fcddf910a9102d768c957c /src/devices/nm-device.h | |
| parent | c8a2b286220c6b2bbde384d0d7dd2629b66e312c (diff) | |
| parent | 270c4830551c9810ad4e83f9a1db2b1cb946208c (diff) | |
Merge tag 'upstream/1.4.2'
Upstream version 1.4.2
Diffstat (limited to 'src/devices/nm-device.h')
| -rw-r--r-- | src/devices/nm-device.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 34d31cad..a757a37e 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -125,7 +125,7 @@ struct _NMDevice { NMExportedObject parent; /* private */ - struct _NMDevicePrivate *priv; + struct _NMDevicePrivate *_priv; }; /* The flags have an relaxing meaning, that means, specifying more flags, can make @@ -588,7 +588,7 @@ void nm_device_reactivate_ip6_config (NMDevice *device, NMSettingIPConfig *s_ip6_old, NMSettingIPConfig *s_ip6_new); -void nm_device_update_hw_address (NMDevice *self); +gboolean nm_device_update_hw_address (NMDevice *self); void nm_device_update_initial_hw_address (NMDevice *self); void nm_device_update_permanent_hw_address (NMDevice *self); void nm_device_update_dynamic_ip_setup (NMDevice *self); |