summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-02-12 14:34:07 +0100
committerThomas Haller <thaller@redhat.com>2020-02-12 14:34:07 +0100
commit43710a9a1deaf88329425300079789cb1312d806 (patch)
tree1de89e0c8f38c942dc5d9068e67554394299eab9
parent94f8d26e9a8aa6a6e8ff1f87855a56ceaeed63a4 (diff)
downloadNetworkManager-43710a9a1deaf88329425300079789cb1312d806.tar.gz
device: reorder fields in NMDeviceEthernetPrivate struct
-rw-r--r--src/devices/nm-device-ethernet.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index f6dc70d4eb..9d29a0e228 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -60,6 +60,15 @@ typedef enum {
} DcbWait;
typedef struct _NMDeviceEthernetPrivate {
+ /* s390 */
+ char * subchan1;
+ char * subchan2;
+ char * subchan3;
+ char * subchannels; /* Composite used for checking unmanaged specs */
+ char ** subchannels_dbus; /* Array exported on D-Bus */
+ char * s390_nettype;
+ GHashTable * s390_options;
+
guint32 speed;
gulong carrier_id;
@@ -77,15 +86,6 @@ typedef struct _NMDeviceEthernetPrivate {
guint supplicant_timeout_id;
- /* s390 */
- char * subchan1;
- char * subchan2;
- char * subchan3;
- char * subchannels; /* Composite used for checking unmanaged specs */
- char ** subchannels_dbus; /* Array exported on D-Bus */
- char * s390_nettype;
- GHashTable * s390_options;
-
NMActRequestGetSecretsCallId *wired_secrets_id;
/* PPPoE */