summaryrefslogtreecommitdiffstats
path: root/lib/route
diff options
context:
space:
mode:
Diffstat (limited to 'lib/route')
-rw-r--r--lib/route/addr.c2
-rw-r--r--lib/route/class.c8
-rw-r--r--lib/route/classid.c6
-rw-r--r--lib/route/cls.c8
-rw-r--r--lib/route/cls/basic.c8
-rw-r--r--lib/route/cls/cgroup.c8
-rw-r--r--lib/route/cls/ematch.c6
-rw-r--r--lib/route/cls/ematch/cmp.c6
-rw-r--r--lib/route/cls/ematch/container.c6
-rw-r--r--lib/route/cls/ematch/meta.c6
-rw-r--r--lib/route/cls/ematch/nbyte.c6
-rw-r--r--lib/route/cls/ematch/text.c6
-rw-r--r--lib/route/cls/ematch_grammar.l6
-rw-r--r--lib/route/cls/ematch_syntax.y6
-rw-r--r--lib/route/cls/fw.c8
-rw-r--r--lib/route/cls/police.c8
-rw-r--r--lib/route/cls/u32.c8
-rw-r--r--lib/route/link.c4
-rw-r--r--lib/route/link/api.c4
-rw-r--r--lib/route/link/bonding.c4
-rw-r--r--lib/route/link/bridge.c4
-rw-r--r--lib/route/link/can.c4
-rw-r--r--lib/route/link/dummy.c4
-rw-r--r--lib/route/link/inet.c4
-rw-r--r--lib/route/link/inet6.c4
-rw-r--r--lib/route/link/vlan.c4
-rw-r--r--lib/route/neigh.c2
-rw-r--r--lib/route/neightbl.c2
-rw-r--r--lib/route/nexthop.c2
-rw-r--r--lib/route/pktloc.c6
-rw-r--r--lib/route/pktloc_grammar.l4
-rw-r--r--lib/route/pktloc_syntax.y4
-rw-r--r--lib/route/qdisc.c6
-rw-r--r--lib/route/qdisc/blackhole.c4
-rw-r--r--lib/route/qdisc/cbq.c6
-rw-r--r--lib/route/qdisc/dsmark.c6
-rw-r--r--lib/route/qdisc/fifo.c6
-rw-r--r--lib/route/qdisc/htb.c6
-rw-r--r--lib/route/qdisc/netem.c6
-rw-r--r--lib/route/qdisc/plug.c6
-rw-r--r--lib/route/qdisc/prio.c6
-rw-r--r--lib/route/qdisc/red.c6
-rw-r--r--lib/route/qdisc/sfq.c6
-rw-r--r--lib/route/qdisc/tbf.c6
-rw-r--r--lib/route/route.c2
-rw-r--r--lib/route/route_obj.c2
-rw-r--r--lib/route/route_utils.c2
-rw-r--r--lib/route/rtnl.c2
-rw-r--r--lib/route/rule.c2
-rw-r--r--lib/route/tc.c6
50 files changed, 127 insertions, 127 deletions
diff --git a/lib/route/addr.c b/lib/route/addr.c
index c5e14bb..95a9447 100644
--- a/lib/route/addr.c
+++ b/lib/route/addr.c
@@ -106,7 +106,7 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/rtnl.h>
#include <netlink/route/addr.h>
diff --git a/lib/route/class.c b/lib/route/class.c
index 399e8a2..050f42a 100644
--- a/lib/route/class.c
+++ b/lib/route/class.c
@@ -6,7 +6,7 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
*/
/**
@@ -15,10 +15,10 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/class.h>
#include <netlink/route/qdisc.h>
#include <netlink/route/classifier.h>
diff --git a/lib/route/classid.c b/lib/route/classid.c
index 255e075..f2d3a01 100644
--- a/lib/route/classid.c
+++ b/lib/route/classid.c
@@ -6,7 +6,7 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2010-2013 Thomas Graf <tgraf@suug.ch>
*/
/**
@@ -15,8 +15,8 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/tc.h>
diff --git a/lib/route/cls.c b/lib/route/cls.c
index 35a010a..7a809bb 100644
--- a/lib/route/cls.c
+++ b/lib/route/cls.c
@@ -6,7 +6,7 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
*/
/**
@@ -15,11 +15,11 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/classifier.h>
#include <netlink/route/link.h>
diff --git a/lib/route/cls/basic.c b/lib/route/cls/basic.c
index 9d7710a..fb1c382 100644
--- a/lib/route/cls/basic.c
+++ b/lib/route/cls/basic.c
@@ -6,7 +6,7 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2008-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2008-2013 Thomas Graf <tgraf@suug.ch>
*/
/**
@@ -22,10 +22,10 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/classifier.h>
#include <netlink/route/cls/basic.h>
#include <netlink/route/cls/ematch.h>
diff --git a/lib/route/cls/cgroup.c b/lib/route/cls/cgroup.c
index 230863b..c5b7561 100644
--- a/lib/route/cls/cgroup.c
+++ b/lib/route/cls/cgroup.c
@@ -6,7 +6,7 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2009-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2009-2013 Thomas Graf <tgraf@suug.ch>
*/
/**
@@ -16,12 +16,12 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/attr.h>
#include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/classifier.h>
#include <netlink/route/cls/cgroup.h>
#include <netlink/route/cls/ematch.h>
diff --git a/lib/route/cls/ematch.c b/lib/route/cls/ematch.c
index 8c9c3dd..89b5067 100644
--- a/lib/route/cls/ematch.c
+++ b/lib/route/cls/ematch.c
@@ -6,7 +6,7 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2008-2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2008-2013 Thomas Graf <tgraf@suug.ch>
*/
/**
@@ -16,8 +16,8 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/route/classifier.h>
#include <netlink/route/cls/ematch.h>
diff --git a/lib/route/cls/ematch/cmp.c b/lib/route/cls/ematch/cmp.c
index 2a1070a..2997cdb 100644
--- a/lib/route/cls/ematch/cmp.c
+++ b/lib/route/cls/ematch/cmp.c
@@ -6,7 +6,7 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2008-2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2008-2013 Thomas Graf <tgraf@suug.ch>
*/
/**
@@ -16,8 +16,8 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/route/cls/ematch.h>
#include <linux/tc_ematch/tc_em_cmp.h>
diff --git a/lib/route/cls/ematch/container.c b/lib/route/cls/ematch/container.c
index 6d73ab6..813391a 100644
--- a/lib/route/cls/ematch/container.c
+++ b/lib/route/cls/ematch/container.c
@@ -6,11 +6,11 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2008-2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2008-2013 Thomas Graf <tgraf@suug.ch>
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/route/cls/ematch.h>
diff --git a/lib/route/cls/ematch/meta.c b/lib/route/cls/ematch/meta.c
index 11f87d6..44f11b9 100644
--- a/lib/route/cls/ematch/meta.c
+++ b/lib/route/cls/ematch/meta.c
@@ -6,7 +6,7 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2010-2013 Thomas Graf <tgraf@suug.ch>
*/
/**
@@ -16,8 +16,8 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/route/cls/ematch.h>
#include <netlink/route/cls/ematch/meta.h>
diff --git a/lib/route/cls/ematch/nbyte.c b/lib/route/cls/ematch/nbyte.c
index 25a9866..8852489 100644
--- a/lib/route/cls/ematch/nbyte.c
+++ b/lib/route/cls/ematch/nbyte.c
@@ -6,7 +6,7 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2010-2013 Thomas Graf <tgraf@suug.ch>
*/
/**
@@ -16,8 +16,8 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/route/cls/ematch.h>
#include <netlink/route/cls/ematch/nbyte.h>
diff --git a/lib/route/cls/ematch/text.c b/lib/route/cls/ematch/text.c
index 9d0241e..e8cdcae 100644
--- a/lib/route/cls/ematch/text.c
+++ b/lib/route/cls/ematch/text.c
@@ -6,7 +6,7 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2010-2013 Thomas Graf <tgraf@suug.ch>
*/
/**
@@ -16,8 +16,8 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/route/cls/ematch.h>
#include <netlink/route/cls/ematch/text.h>
diff --git a/lib/route/cls/ematch_grammar.l b/lib/route/cls/ematch_grammar.l
index 07e7e8c..96ef1a0 100644
--- a/lib/route/cls/ematch_grammar.l
+++ b/lib/route/cls/ematch_grammar.l
@@ -6,12 +6,12 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2010-2013 Thomas Graf <tgraf@suug.ch>
*/
%{
- #include <netlink-local.h>
- #include <netlink-tc.h>
+ #include <netlink-private/netlink.h>
+ #include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/route/cls/ematch.h>
#include <netlink/route/cls/ematch/cmp.h>
diff --git a/lib/route/cls/ematch_syntax.y b/lib/route/cls/ematch_syntax.y
index 39123be..da21039 100644
--- a/lib/route/cls/ematch_syntax.y
+++ b/lib/route/cls/ematch_syntax.y
@@ -6,12 +6,12 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2010-2013 Thomas Graf <tgraf@suug.ch>
*/
%{
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/pktloc.h>
diff --git a/lib/route/cls/fw.c b/lib/route/cls/fw.c
index d24779a..b569d4f 100644
--- a/lib/route/cls/fw.c
+++ b/lib/route/cls/fw.c
@@ -6,7 +6,7 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
* Copyright (c) 2006 Petr Gotthard <petr.gotthard@siemens.com>
* Copyright (c) 2006 Siemens AG Oesterreich
*/
@@ -18,10 +18,10 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/classifier.h>
#include <netlink/route/cls/fw.h>
diff --git a/lib/route/cls/police.c b/lib/route/cls/police.c
index d7ab26b..1f5d284 100644
--- a/lib/route/cls/police.c
+++ b/lib/route/cls/police.c
@@ -6,14 +6,14 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/classifier.h>
#include <netlink/route/cls/police.h>
diff --git a/lib/route/cls/u32.c b/lib/route/cls/u32.c
index aa9eb77..c468ba7 100644
--- a/lib/route/cls/u32.c
+++ b/lib/route/cls/u32.c
@@ -6,7 +6,7 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
* Copyright (c) 2005-2006 Petr Gotthard <petr.gotthard@siemens.com>
* Copyright (c) 2005-2006 Siemens AG Oesterreich
*/
@@ -18,12 +18,12 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/attr.h>
#include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/classifier.h>
#include <netlink/route/cls/u32.h>
diff --git a/lib/route/link.c b/lib/route/link.c
index f817b3a..3171513 100644
--- a/lib/route/link.c
+++ b/lib/route/link.c
@@ -18,7 +18,7 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/attr.h>
#include <netlink/utils.h>
@@ -26,7 +26,7 @@
#include <netlink/hashtable.h>
#include <netlink/route/rtnl.h>
#include <netlink/route/link.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
/** @cond SKIP */
#define LINK_ATTR_MTU (1 << 0)
diff --git a/lib/route/link/api.c b/lib/route/link/api.c
index 392ded3..63ff99c 100644
--- a/lib/route/link/api.c
+++ b/lib/route/link/api.c
@@ -39,11 +39,11 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/link.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
static NL_LIST_HEAD(info_ops);
diff --git a/lib/route/link/bonding.c b/lib/route/link/bonding.c
index 5e78084..b060ee1 100644
--- a/lib/route/link/bonding.c
+++ b/lib/route/link/bonding.c
@@ -20,9 +20,9 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
/**
* Create a new kernel bonding device
diff --git a/lib/route/link/bridge.c b/lib/route/link/bridge.c
index cd9f462..52beedd 100644
--- a/lib/route/link/bridge.c
+++ b/lib/route/link/bridge.c
@@ -9,11 +9,11 @@
* Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/attr.h>
#include <netlink/route/rtnl.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
#define BRIDGE_ATTR_PORT_STATE 0x0001
diff --git a/lib/route/link/can.c b/lib/route/link/can.c
index 4b80d94..76bfa1a 100644
--- a/lib/route/link/can.c
+++ b/lib/route/link/can.c
@@ -22,13 +22,13 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/attr.h>
#include <netlink/utils.h>
#include <netlink/object.h>
#include <netlink/route/rtnl.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
#include <netlink/route/link/can.h>
#include <linux/can/netlink.h>
diff --git a/lib/route/link/dummy.c b/lib/route/link/dummy.c
index c7dabc1..1fd9f5a 100644
--- a/lib/route/link/dummy.c
+++ b/lib/route/link/dummy.c
@@ -19,9 +19,9 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
static struct rtnl_link_info_ops dummy_info_ops = {
.io_name = "dummy",
diff --git a/lib/route/link/inet.c b/lib/route/link/inet.c
index a0e2318..e2c867d 100644
--- a/lib/route/link/inet.c
+++ b/lib/route/link/inet.c
@@ -57,11 +57,11 @@
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/attr.h>
#include <netlink/route/rtnl.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
/** @cond SKIP */
struct inet_data
diff --git a/lib/route/link/inet6.c b/lib/route/link/inet6.c
index 9ee8226..4c627bd 100644
--- a/lib/route/link/inet6.c
+++ b/lib/route/link/inet6.c
@@ -9,11 +9,11 @@
* Copyright (c) 2010 Thomas Graf <tgraf@suug.ch>
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/attr.h>
#include <netlink/route/rtnl.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
struct inet6_data
{
diff --git a/lib/route/link/vlan.c b/lib/route/link/vlan.c
index a9bf955..4f44aa5 100644
--- a/lib/route/link/vlan.c
+++ b/lib/route/link/vlan.c
@@ -22,13 +22,13 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/attr.h>
#include <netlink/utils.h>
#include <netlink/object.h>
#include <netlink/route/rtnl.h>
-#include <netlink/route/link/api.h>
+#include <netlink-private/route/link/api.h>
#include <netlink/route/link/vlan.h>
#include <linux/if_vlan.h>
diff --git a/lib/route/neigh.c b/lib/route/neigh.c
index 4a85a85..c0f80a2 100644
--- a/lib/route/neigh.c
+++ b/lib/route/neigh.c
@@ -148,7 +148,7 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/hashtable.h>
diff --git a/lib/route/neightbl.c b/lib/route/neightbl.c
index 509617b..f9c9c27 100644
--- a/lib/route/neightbl.c
+++ b/lib/route/neightbl.c
@@ -16,7 +16,7 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/rtnl.h>
diff --git a/lib/route/nexthop.c b/lib/route/nexthop.c
index 9990c51..d3ca499 100644
--- a/lib/route/nexthop.c
+++ b/lib/route/nexthop.c
@@ -15,7 +15,7 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/rtnl.h>
diff --git a/lib/route/pktloc.c b/lib/route/pktloc.c
index 70d552b..9fcf4a4 100644
--- a/lib/route/pktloc.c
+++ b/lib/route/pktloc.c
@@ -6,7 +6,7 @@
* License as published by the Free Software Foundation version 2.1
* of the License.
*
- * Copyright (c) 2008-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2008-2013 Thomas Graf <tgraf@suug.ch>
*/
/**
@@ -31,8 +31,8 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/pktloc.h>
diff --git a/lib/route/pktloc_grammar.l b/lib/route/pktloc_grammar.l
index 6b7a933..cbb42b3 100644
--- a/lib/route/pktloc_grammar.l
+++ b/lib/route/pktloc_grammar.l
@@ -1,6 +1,6 @@
%{
- #include <netlink-local.h>
- #include <netlink-tc.h>
+ #include <netlink-private/netlink.h>
+ #include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/pktloc.h>
diff --git a/lib/route/pktloc_syntax.y b/lib/route/pktloc_syntax.y
index 4a2ce48..25d8710 100644
--- a/lib/route/pktloc_syntax.y
+++ b/lib/route/pktloc_syntax.y
@@ -1,6 +1,6 @@
%{
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/pktloc.h>
diff --git a/lib/route/qdisc.c b/lib/route/qdisc.c
index 3d618c6..250d191 100644
--- a/lib/route/qdisc.c
+++ b/lib/route/qdisc.c
@@ -15,12 +15,12 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/link.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/qdisc.h>
#include <netlink/route/class.h>
#include <netlink/route/classifier.h>
diff --git a/lib/route/qdisc/blackhole.c b/lib/route/qdisc/blackhole.c
index 06f5380..339cf78 100644
--- a/lib/route/qdisc/blackhole.c
+++ b/lib/route/qdisc/blackhole.c
@@ -15,9 +15,9 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
static struct rtnl_tc_ops blackhole_ops = {
.to_kind = "blackhole",
diff --git a/lib/route/qdisc/cbq.c b/lib/route/qdisc/cbq.c
index e791a10..95f1761 100644
--- a/lib/route/qdisc/cbq.c
+++ b/lib/route/qdisc/cbq.c
@@ -9,11 +9,11 @@
* Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/qdisc.h>
#include <netlink/route/class.h>
#include <netlink/route/link.h>
diff --git a/lib/route/qdisc/dsmark.c b/lib/route/qdisc/dsmark.c
index b5fd0d6..fd9553d 100644
--- a/lib/route/qdisc/dsmark.c
+++ b/lib/route/qdisc/dsmark.c
@@ -16,12 +16,12 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/qdisc.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/class.h>
#include <netlink/route/qdisc/dsmark.h>
diff --git a/lib/route/qdisc/fifo.c b/lib/route/qdisc/fifo.c
index e87c79a..d94c007 100644
--- a/lib/route/qdisc/fifo.c
+++ b/lib/route/qdisc/fifo.c
@@ -29,10 +29,10 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/qdisc.h>
#include <netlink/route/qdisc/fifo.h>
#include <netlink/utils.h>
diff --git a/lib/route/qdisc/htb.c b/lib/route/qdisc/htb.c
index 9fb0bf6..5a61a4e 100644
--- a/lib/route/qdisc/htb.c
+++ b/lib/route/qdisc/htb.c
@@ -18,12 +18,12 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/cache.h>
#include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/qdisc.h>
#include <netlink/route/class.h>
#include <netlink/route/link.h>
diff --git a/lib/route/qdisc/netem.c b/lib/route/qdisc/netem.c
index ddd404d..06d9fe8 100644
--- a/lib/route/qdisc/netem.c
+++ b/lib/route/qdisc/netem.c
@@ -18,11 +18,11 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/qdisc.h>
#include <netlink/route/qdisc/netem.h>
diff --git a/lib/route/qdisc/plug.c b/lib/route/qdisc/plug.c
index a99b9be..9f53637 100644
--- a/lib/route/qdisc/plug.c
+++ b/lib/route/qdisc/plug.c
@@ -60,11 +60,11 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/qdisc/plug.h>
static int plug_msg_fill(struct rtnl_tc *tc, void *data, struct nl_msg *msg)
diff --git a/lib/route/qdisc/prio.c b/lib/route/qdisc/prio.c
index 2433c61..54a46f0 100644
--- a/lib/route/qdisc/prio.c
+++ b/lib/route/qdisc/prio.c
@@ -26,11 +26,11 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/qdisc.h>
#include <netlink/route/qdisc/prio.h>
diff --git a/lib/route/qdisc/red.c b/lib/route/qdisc/red.c
index 0480282..f05626e 100644
--- a/lib/route/qdisc/red.c
+++ b/lib/route/qdisc/red.c
@@ -16,11 +16,11 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/qdisc.h>
#include <netlink/route/qdisc/red.h>
diff --git a/lib/route/qdisc/sfq.c b/lib/route/qdisc/sfq.c
index 207140f..acbb4ef 100644
--- a/lib/route/qdisc/sfq.c
+++ b/lib/route/qdisc/sfq.c
@@ -23,11 +23,11 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/qdisc.h>
#include <netlink/route/qdisc/sfq.h>
diff --git a/lib/route/qdisc/tbf.c b/lib/route/qdisc/tbf.c
index a115548..eb574d9 100644
--- a/lib/route/qdisc/tbf.c
+++ b/lib/route/qdisc/tbf.c
@@ -15,12 +15,12 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/cache.h>
#include <netlink/utils.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
#include <netlink/route/qdisc.h>
#include <netlink/route/class.h>
#include <netlink/route/link.h>
diff --git a/lib/route/route.c b/lib/route/route.c
index 2218a60..2985187 100644
--- a/lib/route/route.c
+++ b/lib/route/route.c
@@ -16,7 +16,7 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/cache.h>
#include <netlink/utils.h>
diff --git a/lib/route/route_obj.c b/lib/route/route_obj.c
index 0c472b7..8f1e515 100644
--- a/lib/route/route_obj.c
+++ b/lib/route/route_obj.c
@@ -30,7 +30,7 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/cache.h>
#include <netlink/utils.h>
diff --git a/lib/route/route_utils.c b/lib/route/route_utils.c
index 8b73f2b..a5b3966 100644
--- a/lib/route/route_utils.c
+++ b/lib/route/route_utils.c
@@ -37,7 +37,7 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/rtnl.h>
diff --git a/lib/route/rtnl.c b/lib/route/rtnl.c
index 12a7e97..82397e9 100644
--- a/lib/route/rtnl.c
+++ b/lib/route/rtnl.c
@@ -14,7 +14,7 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/rtnl.h>
diff --git a/lib/route/rule.c b/lib/route/rule.c
index 076ca51..b2161a2 100644
--- a/lib/route/rule.c
+++ b/lib/route/rule.c
@@ -16,7 +16,7 @@
* @{
*/
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/rtnl.h>
diff --git a/lib/route/tc.c b/lib/route/tc.c
index 5a0b783..29954fd 100644
--- a/lib/route/tc.c
+++ b/lib/route/tc.c
@@ -15,14 +15,14 @@
* @{
*/
-#include <netlink-local.h>
-#include <netlink-tc.h>
+#include <netlink-private/netlink.h>
+#include <netlink-private/tc.h>
#include <netlink/netlink.h>
#include <netlink/utils.h>
#include <netlink/route/rtnl.h>
#include <netlink/route/link.h>
#include <netlink/route/tc.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
/** @cond SKIP */