From e152ec7bf4ba252ff9d3eb13eabd417b931dac9a Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 24 Sep 2018 09:29:55 +0100 Subject: Import Upstream version 1.12.2 --- libnm-core/nm-utils.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'libnm-core/nm-utils.h') 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__ */ -- cgit 1.3.0-6-gf8a5