From ed2be5373f6ffb1ecec15356fddf5c0dfc28b357 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 1 Aug 2023 09:55:43 +0200
Subject: route: move "include/netlink-private/route/link/sriov.h" to
 lib/route/link-sriov.h

---
 Makefile.am                                |  2 +-
 include/netlink-private/route/link/sriov.h | 28 ----------------------------
 include/netlink-private/types.h            |  2 +-
 lib/route/link-sriov.h                     | 28 ++++++++++++++++++++++++++++
 lib/route/link.c                           |  2 +-
 lib/route/link/sriov.c                     |  2 +-
 tools/clang-format.sh                      |  2 +-
 7 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 include/netlink-private/route/link/sriov.h
 create mode 100644 lib/route/link-sriov.h

diff --git a/Makefile.am b/Makefile.am
index 7372ca1..cd5d09d 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/sriov.h \
 	include/netlink-private/types.h \
 	include/nl-aux-core/nl-core.h \
 	include/nl-aux-route/nl-route.h \
@@ -401,6 +400,7 @@ lib_libnl_route_3_la_SOURCES = \
 	lib/route/cls/mall.c \
 	lib/route/cls/police.c \
 	lib/route/cls/u32.c \
+	lib/route/link-sriov.h \
 	lib/route/link.c \
 	lib/route/link/api.c \
 	lib/route/link/bonding.c \
diff --git a/include/netlink-private/route/link/sriov.h b/include/netlink-private/route/link/sriov.h
deleted file mode 100644
index f7c027a..0000000
--- a/include/netlink-private/route/link/sriov.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-only */
-/*
- * Copyright (c) 2016 Intel Corp. All rights reserved.
- * Copyright (c) 2016 Jef Oliver <jef.oliver@intel.com>
- */
-
-#ifndef NETLINK_PRIV_LINK_SRIOV_H_
-#define NETLINK_PRIV_LINK_SRIOV_H_
-
-#include <netlink/netlink.h>
-#include <netlink/route/link/sriov.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int rtnl_link_sriov_clone(struct rtnl_link *, struct rtnl_link *);
-extern void rtnl_link_sriov_dump_details(struct rtnl_link *, struct nl_dump_params *);
-extern void rtnl_link_sriov_dump_stats(struct rtnl_link *, struct nl_dump_params *);
-extern int rtnl_link_sriov_fill_vflist(struct nl_msg *, struct rtnl_link *);
-extern void rtnl_link_sriov_free_data(struct rtnl_link *);
-extern int rtnl_link_sriov_parse_vflist(struct rtnl_link *, struct nlattr **);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/netlink-private/types.h b/include/netlink-private/types.h
index 141801e..8c57296 100644
--- a/include/netlink-private/types.h
+++ b/include/netlink-private/types.h
@@ -15,7 +15,7 @@
 #include <netlink/idiag/idiagnl.h>
 #include <netlink/netfilter/ct.h>
 #include <netlink-private/object-api.h>
-#include <netlink-private/route/link/sriov.h>
+#include <netlink/route/link/sriov.h>
 #include <netlink/route/nh.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
diff --git a/lib/route/link-sriov.h b/lib/route/link-sriov.h
new file mode 100644
index 0000000..f7c027a
--- /dev/null
+++ b/lib/route/link-sriov.h
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+/*
+ * Copyright (c) 2016 Intel Corp. All rights reserved.
+ * Copyright (c) 2016 Jef Oliver <jef.oliver@intel.com>
+ */
+
+#ifndef NETLINK_PRIV_LINK_SRIOV_H_
+#define NETLINK_PRIV_LINK_SRIOV_H_
+
+#include <netlink/netlink.h>
+#include <netlink/route/link/sriov.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int rtnl_link_sriov_clone(struct rtnl_link *, struct rtnl_link *);
+extern void rtnl_link_sriov_dump_details(struct rtnl_link *, struct nl_dump_params *);
+extern void rtnl_link_sriov_dump_stats(struct rtnl_link *, struct nl_dump_params *);
+extern int rtnl_link_sriov_fill_vflist(struct nl_msg *, struct rtnl_link *);
+extern void rtnl_link_sriov_free_data(struct rtnl_link *);
+extern int rtnl_link_sriov_parse_vflist(struct rtnl_link *, struct nlattr **);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/lib/route/link.c b/lib/route/link.c
index 9967f2d..52fd81f 100644
--- a/lib/route/link.c
+++ b/lib/route/link.c
@@ -21,10 +21,10 @@
 #include <netlink/data.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/link.h>
-#include <netlink-private/route/link/sriov.h>
 
 #include "nl-aux-route/nl-route.h"
 
+#include "link-sriov.h"
 #include "link/link-api.h"
 
 /** @cond SKIP */
diff --git a/lib/route/link/sriov.c b/lib/route/link/sriov.c
index b5c23a4..d4ee4f3 100644
--- a/lib/route/link/sriov.c
+++ b/lib/route/link/sriov.c
@@ -25,9 +25,9 @@
 
 #include <linux/if_ether.h>
 #include <linux/if_link.h>
-#include <netlink-private/route/link/sriov.h>
 #include <netlink/route/link/sriov.h>
 
+#include "link-sriov.h"
 #include "link-api.h"
 
 /** @cond SKIP */
diff --git a/tools/clang-format.sh b/tools/clang-format.sh
index ce1fc1a..e6a0f50 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/sriov.h"
     "include/netlink-private/types.h"
     "include/netlink/addr.h"
     "include/netlink/attr.h"
@@ -212,6 +211,7 @@ EXCLUDE_PATHS_TOPLEVEL+=(
     "lib/route/cls/mall.c"
     "lib/route/cls/police.c"
     "lib/route/cls/u32.c"
+    "lib/route/link-sriov.h"
     "lib/route/link.c"
     "lib/route/link/api.c"
     "lib/route/link/bonding.c"
-- 
cgit v0.12