From 015c4ee59b786fec35118c2a963532b3e05ba5a2 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 13 Mar 2014 13:16:51 +0100 Subject: [PATCH] utils: indicate capability NL_CAPABILITY_ROUTE_BUILD_MSG_SET_SCOPE This capability indicates that libnl does no longer overwrites the route scope in rtnl_route_build_msg(), as fixed by commit 85ec9c7ad80c60f4f619472f2bb9d9595da93b26. Acked-by: Thomas Graf Signed-off-by: Thomas Haller --- include/netlink/utils.h | 8 ++++++++ lib/utils.c | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/include/netlink/utils.h b/include/netlink/utils.h index da46a55..2094bb4 100644 --- a/include/netlink/utils.h +++ b/include/netlink/utils.h @@ -82,6 +82,14 @@ extern void nl_dump_line(struct nl_dump_params *, const char *, ...); enum { NL_CAPABILITY_NONE, + /** + * rtnl_route_build_msg() no longer guesses the route scope + * if explicitly set to RT_SCOPE_NOWHERE. + * @ingroup utils + */ + NL_CAPABILITY_ROUTE_BUILD_MSG_SET_SCOPE = 1, +#define NL_CAPABILITY_ROUTE_BUILD_MSG_SET_SCOPE NL_CAPABILITY_ROUTE_BUILD_MSG_SET_SCOPE + __NL_CAPABILITY_MAX #define NL_CAPABILITY_MAX (__NL_CAPABILITY_MAX - 1) }; diff --git a/lib/utils.c b/lib/utils.c index 7ce06b0..49ff120 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1143,6 +1143,15 @@ int nl_has_capability (int capability) _NL_SETV((i), 1, (v1)) | _NL_SETV((i), 5, (v5)) | \ _NL_SETV((i), 2, (v2)) | _NL_SETV((i), 6, (v6)) | \ _NL_SETV((i), 3, (v3)) | _NL_SETV((i), 7, (v7)) ) + _NL_SET(0, + NL_CAPABILITY_ROUTE_BUILD_MSG_SET_SCOPE, + 0, + 0, + 0, + 0, + 0, + 0, + 0), #undef _NL_SET #undef _NL_SETV #undef _NL_ASSERT