diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:52:15 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:24:27 +0100 |
| commit | e8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch) | |
| tree | 017883e210043859ee695250f6285380b795f8e4 /libnm-core/nm-utils.h | |
| parent | b05c072fe2594e0369cbfb00a3fba176d2d309dc (diff) | |
| parent | 1b878e595ff7be634a4800ca6cc506046e49548e (diff) | |
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'libnm-core/nm-utils.h')
| -rw-r--r-- | libnm-core/nm-utils.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h index 70245869..cf9572b9 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -34,8 +34,9 @@ #include <linux/if_infiniband.h> #include "nm-core-enum-types.h" -#include "nm-setting-wireless-security.h" +#include "nm-setting-sriov.h" #include "nm-setting-tc-config.h" +#include "nm-setting-wireless-security.h" G_BEGIN_DECLS @@ -213,7 +214,7 @@ NM_AVAILABLE_IN_1_2 gboolean nm_utils_enum_from_str (GType type, const char *str, int *out_value, char **err_token); NM_AVAILABLE_IN_1_2 -const char **nm_utils_enum_get_values (GType type, gint from, gint to); +const char **nm_utils_enum_get_values (GType type, int from, int to); NM_AVAILABLE_IN_1_6 guint nm_utils_version (void); @@ -250,9 +251,17 @@ char *nm_utils_tc_tfilter_to_str (NMTCTfilter *tfilter, GError **error /*****************************************************************************/ +NM_AVAILABLE_IN_1_14 +char *nm_utils_sriov_vf_to_str (const NMSriovVF *vf, gboolean omit_index, GError **error); +NM_AVAILABLE_IN_1_14 +NMSriovVF *nm_utils_sriov_vf_from_str (const char *str, GError **error); + +/*****************************************************************************/ + NM_AVAILABLE_IN_1_12 gint64 nm_utils_get_timestamp_msec (void); + G_END_DECLS #endif /* __NM_UTILS_H__ */ |