diff options
| author | Jeremy Bicha <jbicha@ubuntu.com> | 2018-02-08 17:55:49 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2018-02-08 17:55:49 -0500 |
| commit | f1c906035c6ea7eb635664835c153aed553dc2e5 (patch) | |
| tree | 7b870b6cef1f902486dc706084124c6964b342a6 /libnm-core/nm-utils.h | |
| parent | d6158994abe7b2be73443f933ed7fdcc40954c24 (diff) | |
| parent | d0408a3e3b1cc6effec321d098008ef0c4acf91b (diff) | |
Merge tag 'debian/1.10.4-1' into bionic
network-manager Debian release 1.10.4-1
Diffstat (limited to 'libnm-core/nm-utils.h')
| -rw-r--r-- | libnm-core/nm-utils.h | 20 |
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__ */ |