about summary refs log tree commit diff
path: root/libnm-core/nm-utils.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2017-12-12 15:53:47 +0100
committerMichael Biebl <biebl@debian.org>2017-12-12 15:53:47 +0100
commit743faa81fda27a9c03298e8d6074623dc30db606 (patch)
tree28418e92b22530bb05f043084626291ed1e3d46b /libnm-core/nm-utils.h
parent8dda18a856c2a05cefcab6278469c9d8df30f935 (diff)
parentafcd268ea7b1149fbfb66bce4eca659b675da0a2 (diff)
Update upstream source from tag 'upstream/1.10.2'
Update to upstream version '1.10.2'
with Debian dir 41691ea145b392588cd4e9e7496b61d5a95965fb
Diffstat (limited to 'libnm-core/nm-utils.h')
-rw-r--r--libnm-core/nm-utils.h20
1 files changed, 19 insertions, 1 deletions
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
index 77fe18a9..df9284b3 100644
--- a/libnm-core/nm-utils.h
+++ b/libnm-core/nm-utils.h
@@ -15,7 +15,7 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
- * Copyright 2005 - 2014 Red Hat, Inc.
+ * Copyright 2005 - 2017 Red Hat, Inc.
  */
 
 #ifndef __NM_UTILS_H__
@@ -35,6 +35,7 @@
 
 #include "nm-core-enum-types.h"
 #include "nm-setting-wireless-security.h"
+#include "nm-setting-tc-config.h"
 
 G_BEGIN_DECLS
 
@@ -230,6 +231,23 @@ char * nm_utils_format_variant_attributes (GHashTable *attributes,
                                            char attr_separator,
                                            char key_value_separator);
 
+/*****************************************************************************/
+
+NM_AVAILABLE_IN_1_10_2
+NMTCQdisc *nm_utils_tc_qdisc_from_str      (const char *str, GError **error);
+NM_AVAILABLE_IN_1_10_2
+char *nm_utils_tc_qdisc_to_str             (NMTCQdisc *qdisc, GError **error);
+
+NM_AVAILABLE_IN_1_10_2
+NMTCAction *nm_utils_tc_action_from_str    (const char *str, GError **error);
+NM_AVAILABLE_IN_1_10_2
+char *nm_utils_tc_action_to_str            (NMTCAction *action, GError **error);
+
+NM_AVAILABLE_IN_1_10_2
+NMTCTfilter *nm_utils_tc_tfilter_from_str  (const char *str, GError **error);
+NM_AVAILABLE_IN_1_10_2
+char *nm_utils_tc_tfilter_to_str           (NMTCTfilter *tfilter, GError **error);
+
 G_END_DECLS
 
 #endif /* __NM_UTILS_H__ */