Since dpif-netdev-private.h was removed, the naming scheme doesn't make a lot of sense anymore. The 'private' part of the names should be dropped.
Signed-off-by: Ilya Maximets <[email protected]> --- lib/automake.mk | 12 ++++++------ lib/{dpif-netdev-private-dfc.c => dpif-netdev-dfc.c} | 2 +- lib/{dpif-netdev-private-dfc.h => dpif-netdev-dfc.h} | 10 +++++----- ...if-netdev-private-dpcls.c => dpif-netdev-dpcls.c} | 2 +- ...if-netdev-private-dpcls.h => dpif-netdev-dpcls.h} | 6 +++--- ...dpif-netdev-private-flow.h => dpif-netdev-flow.h} | 6 +++--- ...-netdev-private-thread.h => dpif-netdev-thread.h} | 8 ++++---- lib/dpif-netdev.c | 8 ++++---- 8 files changed, 27 insertions(+), 27 deletions(-) rename lib/{dpif-netdev-private-dfc.c => dpif-netdev-dfc.c} (98%) rename lib/{dpif-netdev-private-dfc.h => dpif-netdev-dfc.h} (97%) rename lib/{dpif-netdev-private-dpcls.c => dpif-netdev-dpcls.c} (99%) rename lib/{dpif-netdev-private-dpcls.h => dpif-netdev-dpcls.h} (97%) rename lib/{dpif-netdev-private-flow.h => dpif-netdev-flow.h} (97%) rename lib/{dpif-netdev-private-thread.h => dpif-netdev-thread.h} (98%) diff --git a/lib/automake.mk b/lib/automake.mk index 9f9a5d574..b6120c0e3 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -84,14 +84,14 @@ lib_libopenvswitch_la_SOURCES = \ lib/dp-packet-gso.c \ lib/dp-packet-gso.h \ lib/dpdk.h \ + lib/dpif-netdev-dfc.c \ + lib/dpif-netdev-dfc.h \ + lib/dpif-netdev-dpcls.c \ + lib/dpif-netdev-dpcls.h \ + lib/dpif-netdev-flow.h \ lib/dpif-netdev-perf.c \ lib/dpif-netdev-perf.h \ - lib/dpif-netdev-private-dfc.c \ - lib/dpif-netdev-private-dfc.h \ - lib/dpif-netdev-private-dpcls.c \ - lib/dpif-netdev-private-dpcls.h \ - lib/dpif-netdev-private-flow.h \ - lib/dpif-netdev-private-thread.h \ + lib/dpif-netdev-thread.h \ lib/dpif-netdev.c \ lib/dpif-netdev.h \ lib/dpif-offload.c \ diff --git a/lib/dpif-netdev-private-dfc.c b/lib/dpif-netdev-dfc.c similarity index 98% rename from lib/dpif-netdev-private-dfc.c rename to lib/dpif-netdev-dfc.c index 1d53fafff..ccf311738 100644 --- a/lib/dpif-netdev-private-dfc.c +++ b/lib/dpif-netdev-dfc.c @@ -18,7 +18,7 @@ #include <config.h> -#include "dpif-netdev-private-dfc.h" +#include "dpif-netdev-dfc.h" static void emc_clear_entry(struct emc_entry *ce) diff --git a/lib/dpif-netdev-private-dfc.h b/lib/dpif-netdev-dfc.h similarity index 97% rename from lib/dpif-netdev-private-dfc.h rename to lib/dpif-netdev-dfc.h index 3dfc91f0f..42ad291ed 100644 --- a/lib/dpif-netdev-private-dfc.h +++ b/lib/dpif-netdev-dfc.h @@ -15,12 +15,12 @@ * limitations under the License. */ -#ifndef DPIF_NETDEV_PRIVATE_DFC_H -#define DPIF_NETDEV_PRIVATE_DFC_H 1 +#ifndef DPIF_NETDEV_DFC_H +#define DPIF_NETDEV_DFC_H 1 #include "dpif.h" -#include "dpif-netdev-private-dpcls.h" -#include "dpif-netdev-private-flow.h" +#include "dpif-netdev-dpcls.h" +#include "dpif-netdev-flow.h" #include <stdbool.h> #include <stdint.h> @@ -187,4 +187,4 @@ smc_lookup_single(struct dp_netdev_pmd_thread *pmd, } #endif -#endif /* dpif-netdev-private-dfc.h */ +#endif /* dpif-netdev-dfc.h */ diff --git a/lib/dpif-netdev-private-dpcls.c b/lib/dpif-netdev-dpcls.c similarity index 99% rename from lib/dpif-netdev-private-dpcls.c rename to lib/dpif-netdev-dpcls.c index 31e1a357e..f1f6b0864 100644 --- a/lib/dpif-netdev-private-dpcls.c +++ b/lib/dpif-netdev-dpcls.c @@ -17,7 +17,7 @@ #include <config.h> #include "dpif-netdev.h" -#include "dpif-netdev-private-dpcls.h" +#include "dpif-netdev-dpcls.h" #include "bitmap.h" #include "cmap.h" diff --git a/lib/dpif-netdev-private-dpcls.h b/lib/dpif-netdev-dpcls.h similarity index 97% rename from lib/dpif-netdev-private-dpcls.h rename to lib/dpif-netdev-dpcls.h index 7949134bb..4679d2122 100644 --- a/lib/dpif-netdev-private-dpcls.h +++ b/lib/dpif-netdev-dpcls.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef DPIF_NETDEV_PRIVATE_DPCLS_H -#define DPIF_NETDEV_PRIVATE_DPCLS_H 1 +#ifndef DPIF_NETDEV_DPCLS_H +#define DPIF_NETDEV_DPCLS_H 1 #include "dpif.h" @@ -138,4 +138,4 @@ dpcls_lookup(struct dpcls *cls, const struct netdev_flow_key *keys[], } #endif -#endif /* dpif-netdev-private-dpcls.h */ +#endif /* dpif-netdev-dpcls.h */ diff --git a/lib/dpif-netdev-private-flow.h b/lib/dpif-netdev-flow.h similarity index 97% rename from lib/dpif-netdev-private-flow.h rename to lib/dpif-netdev-flow.h index f05382626..c70931a0f 100644 --- a/lib/dpif-netdev-private-flow.h +++ b/lib/dpif-netdev-flow.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef DPIF_NETDEV_PRIVATE_FLOW_H -#define DPIF_NETDEV_PRIVATE_FLOW_H 1 +#ifndef DPIF_NETDEV_FLOW_H +#define DPIF_NETDEV_FLOW_H 1 #include <stdbool.h> #include <stdint.h> @@ -156,4 +156,4 @@ struct dp_netdev_actions { } #endif -#endif /* dpif-netdev-private-flow.h */ +#endif /* dpif-netdev-flow.h */ diff --git a/lib/dpif-netdev-private-thread.h b/lib/dpif-netdev-thread.h similarity index 98% rename from lib/dpif-netdev-private-thread.h rename to lib/dpif-netdev-thread.h index 2ee855ca4..43adc7fef 100644 --- a/lib/dpif-netdev-private-thread.h +++ b/lib/dpif-netdev-thread.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef DPIF_NETDEV_PRIVATE_THREAD_H -#define DPIF_NETDEV_PRIVATE_THREAD_H 1 +#ifndef DPIF_NETDEV_THREAD_H +#define DPIF_NETDEV_THREAD_H 1 #include <stdbool.h> #include <stdint.h> @@ -24,7 +24,7 @@ #include "ccmap.h" #include "cmap.h" -#include "dpif-netdev-private-dfc.h" +#include "dpif-netdev-dfc.h" #include "dpif-netdev-perf.h" #include "openvswitch/thread.h" @@ -219,4 +219,4 @@ struct dp_netdev_pmd_thread { } #endif -#endif /* dpif-netdev-private-thread.h */ +#endif /* dpif-netdev-thread.h */ diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 73565838f..83114b2f1 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -42,11 +42,11 @@ #include "csum.h" #include "dp-packet.h" #include "dpif.h" +#include "dpif-netdev-dfc.h" +#include "dpif-netdev-dpcls.h" +#include "dpif-netdev-flow.h" #include "dpif-netdev-perf.h" -#include "dpif-netdev-private-dfc.h" -#include "dpif-netdev-private-dpcls.h" -#include "dpif-netdev-private-flow.h" -#include "dpif-netdev-private-thread.h" +#include "dpif-netdev-thread.h" #include "dpif-offload.h" #include "dpif-provider.h" #include "dummy.h" -- 2.53.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
