diff options
| author | Michael Biebl <biebl@debian.org> | 2020-04-11 21:30:33 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-04-11 21:30:33 +0200 |
| commit | f914c41532a9e4f2bb44be074466b62e4cac8db3 (patch) | |
| tree | 046e8e7a186afecf299cd80d62fa1c93903dbecf /libnm-core/nm-setting-macvlan.c | |
| parent | 19e73abd360f0198f94ce49f36ddf009056f6324 (diff) | |
| parent | 1e5977b62f896e844b548c3007ace9e1dfa7f9ed (diff) | |
Update upstream source from tag 'upstream/1.23.90'
Update to upstream version '1.23.90' with Debian dir 38c3873648b51c73a9e448ccb2ac18152c2b3f85
Diffstat (limited to 'libnm-core/nm-setting-macvlan.c')
| -rw-r--r-- | libnm-core/nm-setting-macvlan.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libnm-core/nm-setting-macvlan.c b/libnm-core/nm-setting-macvlan.c index d62184c2..cbaadd3f 100644 --- a/libnm-core/nm-setting-macvlan.c +++ b/libnm-core/nm-setting-macvlan.c @@ -35,8 +35,8 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE ( typedef struct { char *parent; NMSettingMacvlanMode mode; - gboolean promiscuous; - gboolean tap; + bool promiscuous:1; + bool tap:1; } NMSettingMacvlanPrivate; G_DEFINE_TYPE (NMSettingMacvlan, nm_setting_macvlan, NM_TYPE_SETTING) @@ -217,8 +217,11 @@ set_property (GObject *object, guint prop_id, /*****************************************************************************/ static void -nm_setting_macvlan_init (NMSettingMacvlan *setting) +nm_setting_macvlan_init (NMSettingMacvlan *self) { + NMSettingMacvlanPrivate *priv = NM_SETTING_MACVLAN_GET_PRIVATE (self); + + priv->promiscuous = TRUE; } /** @@ -275,7 +278,6 @@ nm_setting_macvlan_class_init (NMSettingMacvlanClass *klass) g_param_spec_string (NM_SETTING_MACVLAN_PARENT, "", "", NULL, G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); @@ -291,7 +293,6 @@ nm_setting_macvlan_class_init (NMSettingMacvlanClass *klass) g_param_spec_uint (NM_SETTING_MACVLAN_MODE, "", "", 0, G_MAXUINT, 0, G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); @@ -306,7 +307,6 @@ nm_setting_macvlan_class_init (NMSettingMacvlanClass *klass) g_param_spec_boolean (NM_SETTING_MACVLAN_PROMISCUOUS, "", "", TRUE, G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); @@ -321,7 +321,6 @@ nm_setting_macvlan_class_init (NMSettingMacvlanClass *klass) g_param_spec_boolean (NM_SETTING_MACVLAN_TAP, "", "", FALSE, G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); |