diff options
| author | Michael Biebl <biebl@debian.org> | 2018-07-03 23:54:48 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-07-03 23:54:48 +0200 |
| commit | 54de7f04d1fac5f29fd54ec4120ba2fc4f9b5714 (patch) | |
| tree | 87729385ff8de744dc44d0b4cc75916494b2fd38 /libnm-core/nm-utils.h | |
| parent | 680d3db45106e7a18665a366e1b57e58cef61506 (diff) | |
| parent | 329b15110c4b183d7a47552abe3a6a6ff933e817 (diff) | |
Merge branch 'experimental'
Diffstat (limited to 'libnm-core/nm-utils.h')
| -rw-r--r-- | libnm-core/nm-utils.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h index df9284b3..70245869 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -233,21 +233,26 @@ char * nm_utils_format_variant_attributes (GHashTable *attributes, /*****************************************************************************/ -NM_AVAILABLE_IN_1_10_2 +NM_AVAILABLE_IN_1_12 NMTCQdisc *nm_utils_tc_qdisc_from_str (const char *str, GError **error); -NM_AVAILABLE_IN_1_10_2 +NM_AVAILABLE_IN_1_12 char *nm_utils_tc_qdisc_to_str (NMTCQdisc *qdisc, GError **error); -NM_AVAILABLE_IN_1_10_2 +NM_AVAILABLE_IN_1_12 NMTCAction *nm_utils_tc_action_from_str (const char *str, GError **error); -NM_AVAILABLE_IN_1_10_2 +NM_AVAILABLE_IN_1_12 char *nm_utils_tc_action_to_str (NMTCAction *action, GError **error); -NM_AVAILABLE_IN_1_10_2 +NM_AVAILABLE_IN_1_12 NMTCTfilter *nm_utils_tc_tfilter_from_str (const char *str, GError **error); -NM_AVAILABLE_IN_1_10_2 +NM_AVAILABLE_IN_1_12 char *nm_utils_tc_tfilter_to_str (NMTCTfilter *tfilter, GError **error); +/*****************************************************************************/ + +NM_AVAILABLE_IN_1_12 +gint64 nm_utils_get_timestamp_msec (void); + G_END_DECLS #endif /* __NM_UTILS_H__ */ |