cache: Make NL_ACT_* and nl_cache_ops_(get|put)() available

Move NL_ACT_* definition and the functions nl_cache_ops_get()
and nl_cache_ops_put() into the public facing API. They can
be considered stable.

Signed-off-by: Thomas Graf <tgraf@suug.ch>

diff --git a/include/netlink-private/cache-api.h b/include/netlink-private/cache-api.h
index 5d9b0ad8eda22e03a5d54ee38cab164888a860ae..f3d9f01a20c9a1485c07689d70df764fcd90c31c 100644 (file)
--- a/include/netlink-private/cache-api.h
+++ b/include/netlink-private/cache-api.h
@@ -109,18 +109,6 @@ extern "C" {
  * @{
  */
 
-enum {
-       NL_ACT_UNSPEC,
-       NL_ACT_NEW,
-       NL_ACT_DEL,
-       NL_ACT_GET,
-       NL_ACT_SET,
-       NL_ACT_CHANGE,
-       __NL_ACT_MAX,
-};
-
-#define NL_ACT_MAX (__NL_ACT_MAX - 1)
-
 #define END_OF_MSGTYPES_LIST   { -1, -1, NULL }
 
 /**
@@ -273,9 +261,6 @@ struct nl_cache_ops
        struct nl_msgtype       co_msgtypes[];
 };
 
-extern void    nl_cache_ops_get(struct nl_cache_ops *);
-extern void    nl_cache_ops_put(struct nl_cache_ops *);
-
 /** @} */
 
 #ifdef __cplusplus

diff --git a/include/netlink/cache.h b/include/netlink/cache.h
index 0da1377714a7756de089aa333a18148a370b49f3..415bb003d2806132ad27891c8dcd24552a359e93 100644 (file)
--- a/include/netlink/cache.h
+++ b/include/netlink/cache.h
@@ -21,6 +21,18 @@
 extern "C" {
 #endif
 
+enum {
+       NL_ACT_UNSPEC,
+       NL_ACT_NEW,
+       NL_ACT_DEL,
+       NL_ACT_GET,
+       NL_ACT_SET,
+       NL_ACT_CHANGE,
+       __NL_ACT_MAX,
+};
+
+#define NL_ACT_MAX (__NL_ACT_MAX - 1)
+
 struct nl_cache;
 typedef void (*change_func_t)(struct nl_cache *, struct nl_object *, int, void *);
 
@@ -146,6 +158,9 @@ extern void                 nl_cache_mngr_info(struct nl_cache_mngr *,
                                                   struct nl_dump_params *);
 extern void                    nl_cache_mngr_free(struct nl_cache_mngr *);
 
+extern void                    nl_cache_ops_get(struct nl_cache_ops *);
+extern void                    nl_cache_ops_put(struct nl_cache_ops *);
+
 #ifdef __cplusplus
 }
 #endif