From fc2844e2632a6b6c6a82be88baf1905f0eb389cc Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 1 Feb 2021 09:53:59 +0100 Subject: [PATCH] device: group boolean fields together --- src/devices/nm-device.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index dc3dd34b01..72777d0aaf 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -244,6 +244,16 @@ typedef struct _NMDeviceClass { */ bool mtu_force_set : 1; + /* Control whether to call stage1 and stage2 callbacks also for assuming + * a device or for external activations. In this case, the callback must + * take care not to touch the device's configuration. */ + bool act_stage1_prepare_also_for_external_or_assume : 1; + bool act_stage2_config_also_for_external_or_assume : 1; + + bool act_stage1_prepare_set_hwaddr_ethernet : 1; + + bool can_reapply_change_ovs_external_ids : 1; + void (*state_changed)(NMDevice * device, NMDeviceState new_state, NMDeviceState old_state, @@ -449,16 +459,6 @@ typedef struct _NMDeviceClass { gboolean (*set_platform_mtu)(NMDevice *self, guint32 mtu); - /* Control whether to call stage1 and stage2 callbacks also for assuming - * a device or for external activations. In this case, the callback must - * take care not to touch the device's configuration. */ - bool act_stage1_prepare_also_for_external_or_assume : 1; - bool act_stage2_config_also_for_external_or_assume : 1; - - bool act_stage1_prepare_set_hwaddr_ethernet : 1; - - bool can_reapply_change_ovs_external_ids : 1; - } NMDeviceClass; GType nm_device_get_type(void);