fix includes after removing some headers

commit f20bbe1f07fcff1509425884f5ed72ca8d5fb6ab
Author: Thomas Graf <tgraf@suug.ch>
Date:   Tue Jan 22 19:10:38 2013 +0100

    No longer install module API headers

This commit causes a regression so no app using libnl can be compiled
against it. This patch fixes it by removing includes of no-longe
existing headers.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Thomas Graf <tgraf@suug.ch>

diff --git a/include/netlink/cache-api.h b/include/netlink/cache-api.h
index b33241585e1ff42d75b600cfdfe17e011329be83..493a551358e405ff91f2e0b8ec68002a9cd0c69a 100644 (file)
--- a/include/netlink/cache-api.h
+++ b/include/netlink/cache-api.h
@@ -13,13 +13,12 @@
 #define NETLINK_CACHE_API_H_
 
 #include <netlink/netlink.h>
+#include <netlink/cache.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef void (*change_func_t)(struct nl_cache *, struct nl_object *, int, void *);
-
 /**
  * @ingroup cache
  * @defgroup cache_api Cache Implementation

diff --git a/include/netlink/cache.h b/include/netlink/cache.h
index ac03842ed059cd582ff6d6689b84574f341dd490..0da1377714a7756de089aa333a18148a370b49f3 100644 (file)
--- a/include/netlink/cache.h
+++ b/include/netlink/cache.h
@@ -16,13 +16,13 @@
 #include <netlink/msg.h>
 #include <netlink/utils.h>
 #include <netlink/object.h>
-#include <netlink/cache-api.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct nl_cache;
+typedef void (*change_func_t)(struct nl_cache *, struct nl_object *, int, void *);
 
 /**
  * @ingroup cache

diff --git a/include/netlink/cli/tc.h b/include/netlink/cli/tc.h
index 85d2e30f61fb529ca4c795237284712ceb40c81b..77042c71d91aa92579f0a66b31e68408f30a4bf3 100644 (file)
--- a/include/netlink/cli/tc.h
+++ b/include/netlink/cli/tc.h
@@ -12,7 +12,9 @@
 #ifndef __NETLINK_CLI_TC_H_
 #define __NETLINK_CLI_TC_H_
 
-#include <netlink/route/tc-api.h>
+#include <netlink/route/tc.h>
+
+struct rtnl_tc_ops;
 
 extern void nl_cli_tc_parse_dev(struct rtnl_tc *, struct nl_cache *, char *);
 extern void nl_cli_tc_parse_parent(struct rtnl_tc *, char *);

diff --git a/include/netlink/netlink.h b/include/netlink/netlink.h
index a501eaac8d07de230849086feeec80b59e0f9422..5f685489b1ba7e6673937a8b159394e947dcb004 100644 (file)
--- a/include/netlink/netlink.h
+++ b/include/netlink/netlink.h
@@ -32,13 +32,14 @@
 #include <netlink/handlers.h>
 #include <netlink/socket.h>
 #include <netlink/object.h>
-#include <netlink/cache-api.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct ucred;
+struct nl_cache_ops;
+struct nl_parser_param;
 
 extern int nl_debug;
 extern struct nl_dump_params nl_debug_dp;

diff --git a/include/netlink/route/tc-api.h b/include/netlink/route/tc-api.h
index d89408f843adbf40428e280f1bc7eb042b4e530a..601a8df975470daff9b3ac861a002ace240662ff 100644 (file)
--- a/include/netlink/route/tc-api.h
+++ b/include/netlink/route/tc-api.h
@@ -20,13 +20,6 @@
 extern "C" {
 #endif
 
-enum rtnl_tc_type {
-       RTNL_TC_TYPE_QDISC,
-       RTNL_TC_TYPE_CLASS,
-       RTNL_TC_TYPE_CLS,
-       __RTNL_TC_TYPE_MAX,
-};
-
 #define RTNL_TC_TYPE_MAX (__RTNL_TC_TYPE_MAX - 1)
 
 /**

diff --git a/include/netlink/route/tc.h b/include/netlink/route/tc.h
index 50ca6deb7b56b88194192623da17b55ac7ef3b03..caee60c99a035ae79010a2bcc5f007c09fd7b21e 100644 (file)
--- a/include/netlink/route/tc.h
+++ b/include/netlink/route/tc.h
@@ -23,6 +23,13 @@
 extern "C" {
 #endif
 
+enum rtnl_tc_type {
+       RTNL_TC_TYPE_QDISC,
+       RTNL_TC_TYPE_CLASS,
+       RTNL_TC_TYPE_CLS,
+       __RTNL_TC_TYPE_MAX,
+};
+
 /**
  * Compute tc handle based on major and minor parts
  * @ingroup tc