diff options
| author | Michael Biebl <biebl@debian.org> | 2018-09-08 17:44:52 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-09-08 17:44:52 +0200 |
| commit | d8cad4490d54acb162ad218a8a682ab379bb8bcc (patch) | |
| tree | 140abd545d62a1b0144be27c93ad8edb021e4311 /libnm-core/nm-utils.h | |
| parent | e3bc109cd0eb97346c448f591af518d85dbee21b (diff) | |
| parent | 8f7a3cbbdd0c0a48277c341dd3a8ec8743ae9735 (diff) | |
Update upstream source from tag 'upstream/1.13.90'
Update to upstream version '1.13.90' with Debian dir d7d3d98e1240df49343a72511602da7099232e10
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__ */ |