diff options
| author | Michael Biebl <biebl@debian.org> | 2018-10-30 10:26:10 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-10-30 10:26:10 +0100 |
| commit | bd8ab7e82b1ae4e8899b30a59a7b35ba009344ea (patch) | |
| tree | 83691f38efeef4d5dd7a85c0893fa8a54274728f /libnm-util/nm-setting-dcb.c | |
| parent | c15221a34c0af3a5b2c03dfe80c2a9841acefb03 (diff) | |
| parent | 3cdef184c37fa2c152f8542c6107f8a623735a1c (diff) | |
Merge branch 'master' into stretch-backports
Diffstat (limited to 'libnm-util/nm-setting-dcb.c')
| -rw-r--r-- | libnm-util/nm-setting-dcb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c index 2cd0bdaf..17a3a871 100644 --- a/libnm-util/nm-setting-dcb.c +++ b/libnm-util/nm-setting-dcb.c @@ -75,14 +75,14 @@ NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_DCB) typedef struct { NMSettingDcbFlags app_fcoe_flags; - gint app_fcoe_priority; + int app_fcoe_priority; char * app_fcoe_mode; NMSettingDcbFlags app_iscsi_flags; - gint app_iscsi_priority; + int app_iscsi_priority; NMSettingDcbFlags app_fip_flags; - gint app_fip_priority; + int app_fip_priority; /* Priority Flow Control */ NMSettingDcbFlags pfc_flags; @@ -161,7 +161,7 @@ nm_setting_dcb_get_app_fcoe_flags (NMSettingDcb *setting) * * Since: 0.9.10 **/ -gint +int nm_setting_dcb_get_app_fcoe_priority (NMSettingDcb *setting) { g_return_val_if_fail (NM_IS_SETTING_DCB (setting), 0); @@ -209,7 +209,7 @@ nm_setting_dcb_get_app_iscsi_flags (NMSettingDcb *setting) * * Since: 0.9.10 **/ -gint +int nm_setting_dcb_get_app_iscsi_priority (NMSettingDcb *setting) { g_return_val_if_fail (NM_IS_SETTING_DCB (setting), 0); @@ -241,7 +241,7 @@ nm_setting_dcb_get_app_fip_flags (NMSettingDcb *setting) * * Since: 0.9.10 **/ -gint +int nm_setting_dcb_get_app_fip_priority (NMSettingDcb *setting) { g_return_val_if_fail (NM_IS_SETTING_DCB (setting), 0); @@ -665,7 +665,7 @@ check_uint_array (const guint *array, } static gboolean -check_priority (gint val, +check_priority (int val, NMSettingDcbFlags flags, const char *prop_name, GError **error) |