diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-09-01 14:19:02 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-09-01 14:19:02 (GMT) |
| commit | 7b167ef85f6eb4d7faca349302478b2dc121e309 (patch) | |
| tree | f21c130510b824543c0ced8e65c62c232e69b046 | |
| parent | 2c862a606bc18a9e17bc764db1d3ef2cc1b2e368 (diff) | |
| download | libnl-7b167ef85f6eb4d7faca349302478b2dc121e309.zip libnl-7b167ef85f6eb4d7faca349302478b2dc121e309.tar.gz libnl-7b167ef85f6eb4d7faca349302478b2dc121e309.tar.bz2 | |
libnl-3.5.0 releaselibnl3_5_0
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/configure.ac | 2 | ||||
| -rw-r--r-- | include/netlink/utils.h | 6 | ||||
| -rw-r--r-- | lib/utils.c | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index dfead98..ee44d89 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ # copied from glib m4_define([libnl_major_version], [3]) -m4_define([libnl_minor_version], [4]) +m4_define([libnl_minor_version], [5]) m4_define([libnl_micro_version], [0]) m4_define([libnl_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])]) diff --git a/doc/configure.ac b/doc/configure.ac index 4539c9b..187447c 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -9,7 +9,7 @@ # Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch> # -AC_INIT(libnl-doc, [3.4.0], [http://www.infradead.org/~tgr/libnl/]) +AC_INIT(libnl-doc, [3.5.0], [http://www.infradead.org/~tgr/libnl/]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([foreign]) diff --git a/include/netlink/utils.h b/include/netlink/utils.h index dc22c9d..b05ce66 100644 --- a/include/netlink/utils.h +++ b/include/netlink/utils.h @@ -294,6 +294,12 @@ enum { NL_CAPABILITY_ROUTE_FIX_VLAN_SET_EGRESS_MAP = 29, #define NL_CAPABILITY_ROUTE_FIX_VLAN_SET_EGRESS_MAP NL_CAPABILITY_ROUTE_FIX_VLAN_SET_EGRESS_MAP + /** + * The library version is libnl3 3.5.0 or newer. This capability should never be backported. + */ + NL_CAPABILITY_VERSION_3_5_0 = 30, +#define NL_CAPABILITY_VERSION_3_5_0 NL_CAPABILITY_VERSION_3_5_0 + __NL_CAPABILITY_MAX, NL_CAPABILITY_MAX = (__NL_CAPABILITY_MAX - 1), #define NL_CAPABILITY_MAX NL_CAPABILITY_MAX diff --git a/lib/utils.c b/lib/utils.c index d4e6c81..496bf3b 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1223,7 +1223,7 @@ int nl_has_capability (int capability) NL_CAPABILITY_VERSION_3_3_0, NL_CAPABILITY_VERSION_3_4_0, NL_CAPABILITY_ROUTE_FIX_VLAN_SET_EGRESS_MAP, - 0, + NL_CAPABILITY_VERSION_3_5_0, 0, 0), /* IMPORTANT: these capability numbers are intended to be universal and stable |