include: move "include/netlink-private/route/link/api.h" to lib/route

This header is entirely private to compiling libnl-route-3 under
lib/route. Move the header there.

32 files changed, 59 insertions, 31 deletions

diff --git a/Makefile.am b/Makefile.am
index 7eae255..1ca4049 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -274,7 +274,6 @@ noinst_HEADERS = \
 	include/netlink-private/cache-api.h \
 	include/netlink-private/netlink.h \
 	include/netlink-private/object-api.h \
-	include/netlink-private/route/link/api.h \
 	include/netlink-private/route/link/sriov.h \
 	include/netlink-private/route/nexthop-encap.h \
 	include/netlink-private/route/tc-api.h \
@@ -423,6 +422,7 @@ lib_libnl_route_3_la_SOURCES = \
 	lib/route/link/ipip.c \
 	lib/route/link/ipvlan.c \
 	lib/route/link/ipvti.c \
+	lib/route/link/link-api.h \
 	lib/route/link/macsec.c \
 	lib/route/link/macvlan.c \
 	lib/route/link/ppp.c \
diff --git a/lib/route/link.c b/lib/route/link.c
index 73d5916..9967f2d 100644
--- a/lib/route/link.c
+++ b/lib/route/link.c
@@ -21,11 +21,12 @@
 #include <netlink/data.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link.h>
-#include <netlink-private/route/link/api.h>
 #include <netlink-private/route/link/sriov.h>
 
 #include "nl-aux-route/nl-route.h"
 
+#include "link/link-api.h"
+
 /** @cond SKIP */
 #define LINK_ATTR_MTU		(1 <<  0)
 #define LINK_ATTR_LINK		(1 <<  1)
diff --git a/lib/route/link/api.c b/lib/route/link/api.c
index d9299f1..a74992f 100644
--- a/lib/route/link/api.c
+++ b/lib/route/link/api.c
@@ -37,7 +37,8 @@
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/link.h>
-#include <netlink-private/route/link/api.h>
+
+#include "link-api.h"
 
 static NL_LIST_HEAD(info_ops);
 
diff --git a/lib/route/link/bonding.c b/lib/route/link/bonding.c
index ebcea34..d250172 100644
--- a/lib/route/link/bonding.c
+++ b/lib/route/link/bonding.c
@@ -17,7 +17,8 @@
 #include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 #include <netlink/route/link/bonding.h>
-#include <netlink-private/route/link/api.h>
+
+#include "link-api.h"
 
 #define BOND_HAS_MODE		(1 << 0)
 #define BOND_HAS_ACTIVE_SLAVE	(1 << 1)
diff --git a/lib/route/link/bridge.c b/lib/route/link/bridge.c
index bd70912..1c18545 100644
--- a/lib/route/link/bridge.c
+++ b/lib/route/link/bridge.c
@@ -16,9 +16,10 @@
 #include <netlink/attr.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/bridge.h>
-#include <netlink-private/route/link/api.h>
 #include <linux/if_bridge.h>
 
+#include "link-api.h"
+
 #define VLAN_VID_MASK           0x0fff /* VLAN Identifier */
 
 /** @cond SKIP */
diff --git a/lib/route/link/bridge_info.c b/lib/route/link/bridge_info.c
index 2d81ee1..79aa9a0 100644
--- a/lib/route/link/bridge_info.c
+++ b/lib/route/link/bridge_info.c
@@ -13,7 +13,8 @@
 
 #include <netlink-private/netlink.h>
 #include <netlink/route/link/bridge_info.h>
-#include <netlink-private/route/link/api.h>
+
+#include "link-api.h"
 
 #define BRIDGE_ATTR_VLAN_FILTERING (1 << 0)
 #define BRIDGE_ATTR_VLAN_PROTOCOL (1 << 1)
diff --git a/lib/route/link/can.c b/lib/route/link/can.c
index 263416e..7b1c003 100644
--- a/lib/route/link/can.c
+++ b/lib/route/link/can.c
@@ -22,11 +22,12 @@
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
-#include <netlink-private/route/link/api.h>
 #include <netlink/route/link/can.h>
 
 #include <linux/can/netlink.h>
 
+#include "link-api.h"
+
 /** @cond SKIP */
 #define CAN_HAS_BITTIMING		(1<<0)
 #define CAN_HAS_BITTIMING_CONST		(1<<1)
diff --git a/lib/route/link/dummy.c b/lib/route/link/dummy.c
index 8f59c1b..7e23f3c 100644
--- a/lib/route/link/dummy.c
+++ b/lib/route/link/dummy.c
@@ -15,7 +15,8 @@
 
 #include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
-#include <netlink-private/route/link/api.h>
+
+#include "link-api.h"
 
 static struct rtnl_link_info_ops dummy_info_ops = {
 	.io_name		= "dummy",
diff --git a/lib/route/link/geneve.c b/lib/route/link/geneve.c
index fde4dee..f89a123 100644
--- a/lib/route/link/geneve.c
+++ b/lib/route/link/geneve.c
@@ -20,9 +20,9 @@
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
-#include <netlink-private/route/link/api.h>
 #include <netlink/route/link/geneve.h>
 
+#include "link-api.h"
 
 /** @cond SKIP */
 #define GENEVE_ATTR_ID          (1<<0)
diff --git a/lib/route/link/ifb.c b/lib/route/link/ifb.c
index a1a19d9..d184d78 100644
--- a/lib/route/link/ifb.c
+++ b/lib/route/link/ifb.c
@@ -15,7 +15,8 @@
 
 #include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
-#include <netlink-private/route/link/api.h>
+
+#include "link-api.h"
 
 static struct rtnl_link_info_ops ifb_info_ops = {
 	.io_name		= "ifb",
diff --git a/lib/route/link/inet.c b/lib/route/link/inet.c
index dc40d5c..128ebac 100644
--- a/lib/route/link/inet.c
+++ b/lib/route/link/inet.c
@@ -56,7 +56,8 @@
 #include <netlink/attr.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/inet.h>
-#include <netlink-private/route/link/api.h>
+
+#include "link-api.h"
 
 /** @cond SKIP */
 struct inet_data
diff --git a/lib/route/link/inet6.c b/lib/route/link/inet6.c
index 67a031c..2c8935f 100644
--- a/lib/route/link/inet6.c
+++ b/lib/route/link/inet6.c
@@ -8,7 +8,8 @@
 #include <netlink/attr.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/inet6.h>
-#include <netlink-private/route/link/api.h>
+
+#include "link-api.h"
 
 #include "base/nl-base-utils.h"
 #include "nl-intern-route/nl-intern-route.h"
diff --git a/lib/route/link/ip6gre.c b/lib/route/link/ip6gre.c
index 5bc903d..79d5774 100644
--- a/lib/route/link/ip6gre.c
+++ b/lib/route/link/ip6gre.c
@@ -20,9 +20,10 @@
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/ip6gre.h>
-#include <netlink-private/route/link/api.h>
 #include <linux/if_tunnel.h>
 
+#include "link-api.h"
+
 #define IP6GRE_ATTR_LINK          (1 << 0)
 #define IP6GRE_ATTR_IFLAGS        (1 << 1)
 #define IP6GRE_ATTR_OFLAGS        (1 << 2)
diff --git a/lib/route/link/ip6tnl.c b/lib/route/link/ip6tnl.c
index 46b5559..c97c042 100644
--- a/lib/route/link/ip6tnl.c
+++ b/lib/route/link/ip6tnl.c
@@ -23,10 +23,11 @@
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/ip6tnl.h>
-#include <netlink-private/route/link/api.h>
 #include <linux/if_tunnel.h>
 #include <netinet/in.h>
 
+#include "link-api.h"
+
 #define IP6_TNL_ATTR_LINK          (1 << 0)
 #define IP6_TNL_ATTR_LOCAL         (1 << 1)
 #define IP6_TNL_ATTR_REMOTE        (1 << 2)
diff --git a/lib/route/link/ip6vti.c b/lib/route/link/ip6vti.c
index 46dc803..def67e4 100644
--- a/lib/route/link/ip6vti.c
+++ b/lib/route/link/ip6vti.c
@@ -20,9 +20,10 @@
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/ip6vti.h>
-#include <netlink-private/route/link/api.h>
 #include <linux/if_tunnel.h>
 
+#include "link-api.h"
+
 #define IP6VTI_ATTR_LINK      (1 << 0)
 #define IP6VTI_ATTR_IKEY      (1 << 1)
 #define IP6VTI_ATTR_OKEY      (1 << 2)
diff --git a/lib/route/link/ipgre.c b/lib/route/link/ipgre.c
index 71613f1..a7bdce2 100644
--- a/lib/route/link/ipgre.c
+++ b/lib/route/link/ipgre.c
@@ -23,9 +23,10 @@
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/ipgre.h>
-#include <netlink-private/route/link/api.h>
 #include <linux/if_tunnel.h>
 
+#include "link-api.h"
+
 #define IPGRE_ATTR_LINK          (1 << 0)
 #define IPGRE_ATTR_IFLAGS        (1 << 1)
 #define IPGRE_ATTR_OFLAGS        (1 << 2)
diff --git a/lib/route/link/ipip.c b/lib/route/link/ipip.c
index 6ff85a8..e05852e 100644
--- a/lib/route/link/ipip.c
+++ b/lib/route/link/ipip.c
@@ -23,9 +23,10 @@
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/ipip.h>
-#include <netlink-private/route/link/api.h>
 #include <linux/if_tunnel.h>
 
+#include "link-api.h"
+
 #define IPIP_ATTR_LINK          (1 << 0)
 #define IPIP_ATTR_LOCAL         (1 << 1)
 #define IPIP_ATTR_REMOTE        (1 << 2)
diff --git a/lib/route/link/ipvlan.c b/lib/route/link/ipvlan.c
index 9b87c28..66d0491 100644
--- a/lib/route/link/ipvlan.c
+++ b/lib/route/link/ipvlan.c
@@ -22,11 +22,12 @@
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
-#include <netlink-private/route/link/api.h>
 #include <netlink/route/link/ipvlan.h>
 
 #include <linux/if_link.h>
 
+#include "link-api.h"
+
 /** @cond SKIP */
 #define IPVLAN_HAS_MODE	(1<<0)
 
diff --git a/lib/route/link/ipvti.c b/lib/route/link/ipvti.c
index 5568ebc..b0e61e8 100644
--- a/lib/route/link/ipvti.c
+++ b/lib/route/link/ipvti.c
@@ -23,9 +23,10 @@
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/ipvti.h>
-#include <netlink-private/route/link/api.h>
 #include <linux/if_tunnel.h>
 
+#include "link-api.h"
+
 #define IPVTI_ATTR_LINK		 (1 << 0)
 #define IPVTI_ATTR_IKEY		 (1 << 1)
 #define IPVTI_ATTR_OKEY		 (1 << 2)
diff --git a/include/netlink-private/route/link/api.h b/lib/route/link/link-api.h
index 189f361..189f361 100644
--- a/include/netlink-private/route/link/api.h
+++ b/lib/route/link/link-api.h
diff --git a/lib/route/link/macsec.c b/lib/route/link/macsec.c
index a23cba2..193c56d 100644
--- a/lib/route/link/macsec.c
+++ b/lib/route/link/macsec.c
@@ -22,11 +22,12 @@
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/macsec.h>
-#include <netlink-private/route/link/api.h>
 #include "base/nl-base-utils.h"
 
 #include <linux/if_macsec.h>
 
+#include "link-api.h"
+
 /** @cond SKIP */
 #define MACSEC_ATTR_SCI			(1 << 0)
 #define MACSEC_ATTR_ICV_LEN		(1 << 1)
diff --git a/lib/route/link/macvlan.c b/lib/route/link/macvlan.c
index aae6c92..3456e28 100644
--- a/lib/route/link/macvlan.c
+++ b/lib/route/link/macvlan.c
@@ -23,12 +23,13 @@
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
-#include <netlink-private/route/link/api.h>
 #include <netlink/route/link/macvlan.h>
 #include <netlink/route/link/macvtap.h>
 
 #include <linux/if_link.h>
 
+#include "link-api.h"
+
 /** @cond SKIP */
 #define MACVLAN_HAS_MODE        (1<<0)
 #define MACVLAN_HAS_FLAGS       (1<<1)
diff --git a/lib/route/link/ppp.c b/lib/route/link/ppp.c
index 75c614a..fd38d89 100644
--- a/lib/route/link/ppp.c
+++ b/lib/route/link/ppp.c
@@ -18,7 +18,8 @@
 
 #include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
-#include <netlink-private/route/link/api.h>
+
+#include "link-api.h"
 
 /** @cond SKIP */
 #define PPP_ATTR_FD		(1<<0)
diff --git a/lib/route/link/sit.c b/lib/route/link/sit.c
index f66824c..0a20b6d 100644
--- a/lib/route/link/sit.c
+++ b/lib/route/link/sit.c
@@ -23,9 +23,10 @@
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/sit.h>
-#include <netlink-private/route/link/api.h>
 #include <linux/if_tunnel.h>
 
+#include "link-api.h"
+
 #define SIT_ATTR_LINK          (1 << 0)
 #define SIT_ATTR_LOCAL         (1 << 1)
 #define SIT_ATTR_REMOTE        (1 << 2)
diff --git a/lib/route/link/sriov.c b/lib/route/link/sriov.c
index 3a72814..b5c23a4 100644
--- a/lib/route/link/sriov.c
+++ b/lib/route/link/sriov.c
@@ -20,7 +20,6 @@
  */
 
 #include <netlink-private/netlink.h>
-#include <netlink-private/route/link/api.h>
 #include <netlink/netlink.h>
 #include <netlink/route/link.h>
 
@@ -29,6 +28,8 @@
 #include <netlink-private/route/link/sriov.h>
 #include <netlink/route/link/sriov.h>
 
+#include "link-api.h"
+
 /** @cond SKIP */
 
 #define SRIOVON "on"
diff --git a/lib/route/link/team.c b/lib/route/link/team.c
index 6de93d1..6f722f1 100644
--- a/lib/route/link/team.c
+++ b/lib/route/link/team.c
@@ -16,9 +16,10 @@
 
 #include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
-#include <netlink-private/route/link/api.h>
 #include <netlink/route/link/team.h>
 
+#include "link-api.h"
+
 /**
  * Allocate link object of type team
  *
diff --git a/lib/route/link/veth.c b/lib/route/link/veth.c
index 4cba350..5a202fe 100644
--- a/lib/route/link/veth.c
+++ b/lib/route/link/veth.c
@@ -22,12 +22,13 @@
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
-#include <netlink-private/route/link/api.h>
 #include <netlink/route/link/veth.h>
 
 #include <linux/if_link.h>
 #include <linux/veth.h>
 
+#include "link-api.h"
+
 static struct nla_policy veth_policy[VETH_INFO_MAX+1] = {
 	[VETH_INFO_PEER]	= { .minlen = sizeof(struct ifinfomsg) },
 };
diff --git a/lib/route/link/vlan.c b/lib/route/link/vlan.c
index ed11584..f33e37c 100644
--- a/lib/route/link/vlan.c
+++ b/lib/route/link/vlan.c
@@ -22,11 +22,12 @@
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
-#include <netlink-private/route/link/api.h>
 #include <netlink/route/link/vlan.h>
 
 #include <linux/if_vlan.h>
 
+#include "link-api.h"
+
 /** @cond SKIP */
 #define VLAN_HAS_ID		(1<<0)
 #define VLAN_HAS_FLAGS		(1<<1)
diff --git a/lib/route/link/vrf.c b/lib/route/link/vrf.c
index eb63fa7..1cc53b6 100644
--- a/lib/route/link/vrf.c
+++ b/lib/route/link/vrf.c
@@ -23,12 +23,13 @@
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
-#include <netlink-private/route/link/api.h>
 #include <netlink/route/link/vrf.h>
 
 #include <linux/if_link.h>
 #include <linux-private/linux/rtnetlink.h>
 
+#include "link-api.h"
+
 #define VRF_TABLE_ID_MAX  RT_TABLE_MAX
 
 /** @cond SKIP */
diff --git a/lib/route/link/vxlan.c b/lib/route/link/vxlan.c
index da60994..9009016 100644
--- a/lib/route/link/vxlan.c
+++ b/lib/route/link/vxlan.c
@@ -22,11 +22,12 @@
 #include <netlink/utils.h>
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
-#include <netlink-private/route/link/api.h>
 #include <netlink/route/link/vxlan.h>
 
 #include <linux/if_link.h>
 
+#include "link-api.h"
+
 /** @cond SKIP */
 #define VXLAN_ATTR_ID                  (1<<0)
 #define VXLAN_ATTR_GROUP               (1<<1)
diff --git a/lib/route/link/xfrmi.c b/lib/route/link/xfrmi.c
index f28bc41..642205e 100644
--- a/lib/route/link/xfrmi.c
+++ b/lib/route/link/xfrmi.c
@@ -25,7 +25,8 @@
 #include <netlink/object.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link/xfrmi.h>
-#include <netlink-private/route/link/api.h>
+
+#include "link-api.h"
 
 #define XFRMI_ATTR_LINK  (1 << 0)
 #define XFRMI_ATTR_IF_ID (1 << 1)
diff --git a/tools/clang-format.sh b/tools/clang-format.sh
index a2f1359..01c657d 100755
--- a/tools/clang-format.sh
+++ b/tools/clang-format.sh
@@ -17,7 +17,6 @@ EXCLUDE_PATHS_TOPLEVEL+=(
     "include/netlink-private/cache-api.h"
     "include/netlink-private/netlink.h"
     "include/netlink-private/object-api.h"
-    "include/netlink-private/route/link/api.h"
     "include/netlink-private/route/link/sriov.h"
     "include/netlink-private/route/nexthop-encap.h"
     "include/netlink-private/route/tc-api.h"
@@ -233,6 +232,7 @@ EXCLUDE_PATHS_TOPLEVEL+=(
     "lib/route/link/ipip.c"
     "lib/route/link/ipvlan.c"
     "lib/route/link/ipvti.c"
+    "lib/route/link/link-api.h"
     "lib/route/link/macsec.c"
     "lib/route/link/macvlan.c"
     "lib/route/link/ppp.c"