diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /libnm-util/nm-setting-dcb.c | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
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) |