Move lib/ofp-actions.h to include/openvswitch directory

Signed-off-by: Ben Warren <ben@skyportsystems.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

10 files changed, 53 insertions, 59 deletions

diff --git a/ofproto/bond.c b/ofproto/bond.c
index 4cb1c834e..0dbd0d270 100644
--- a/ofproto/bond.c
+++ b/ofproto/bond.c
@@ -23,31 +23,30 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "openvswitch/ofp-util.h"
-#include "ofp-actions.h"
-#include "openvswitch/ofpbuf.h"
-#include "ofproto/ofproto-provider.h"
-#include "ofproto/ofproto-dpif.h"
-#include "ofproto/ofproto-dpif-rid.h"
 #include "connectivity.h"
 #include "coverage.h"
-#include "openvswitch/dynamic-string.h"
+#include "dp-packet.h"
 #include "flow.h"
 #include "hmap.h"
 #include "lacp.h"
-#include "openvswitch/list.h"
 #include "netdev.h"
 #include "odp-util.h"
+#include "ofproto/ofproto-dpif.h"
+#include "ofproto/ofproto-dpif-rid.h"
+#include "ofproto/ofproto-provider.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/list.h"
+#include "openvswitch/match.h"
+#include "openvswitch/ofp-actions.h"
+#include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
+#include "openvswitch/vlog.h"
 #include "packets.h"
-#include "dp-packet.h"
 #include "poll-loop.h"
 #include "seq.h"
-#include "openvswitch/match.h"
 #include "shash.h"
 #include "timeval.h"
 #include "unixctl.h"
-#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(bond);
 
diff --git a/ofproto/bundles.c b/ofproto/bundles.c
index 5996c018f..232cc15e0 100644
--- a/ofproto/bundles.c
+++ b/ofproto/bundles.c
@@ -18,12 +18,13 @@
 
 #include <config.h>
 
+#include "bundles.h"
 #include "coverage.h"
 #include "fail-open.h"
 #include "in-band.h"
 #include "odp-util.h"
-#include "ofp-actions.h"
 #include "ofproto-provider.h"
+#include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-msgs.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
@@ -38,8 +39,6 @@
 #include "stream.h"
 #include "timeval.h"
 
-#include "bundles.h"
-
 VLOG_DEFINE_THIS_MODULE(bundles);
 
 static struct ofp_bundle *
diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c
index 2649d4431..0c48b7785 100644
--- a/ofproto/connmgr.c
+++ b/ofproto/connmgr.c
@@ -15,19 +15,18 @@
  */
 
 #include <config.h>
-
-#include "connmgr.h"
-
 #include <errno.h>
 #include <stdlib.h>
 
+#include "bundles.h"
+#include "connmgr.h"
 #include "coverage.h"
 #include "fail-open.h"
 #include "in-band.h"
 #include "odp-util.h"
-#include "ofp-actions.h"
 #include "ofproto-provider.h"
 #include "openvswitch/dynamic-string.h"
+#include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-msgs.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
@@ -42,8 +41,6 @@
 #include "stream.h"
 #include "timeval.h"
 
-#include "bundles.h"
-
 VLOG_DEFINE_THIS_MODULE(connmgr);
 static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
 
diff --git a/ofproto/fail-open.c b/ofproto/fail-open.c
index 68a83fa96..d8ec2131e 100644
--- a/ofproto/fail-open.c
+++ b/ofproto/fail-open.c
@@ -15,26 +15,26 @@
  */
 
 #include <config.h>
-#include "fail-open.h"
 #include <inttypes.h>
 #include <stdlib.h>
 #include "classifier.h"
 #include "connmgr.h"
+#include "dp-packet.h"
+#include "fail-open.h"
 #include "flow.h"
 #include "mac-learning.h"
 #include "odp-util.h"
-#include "openvswitch/ofpbuf.h"
-#include "ofp-actions.h"
+#include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-util.h"
+#include "openvswitch/ofpbuf.h"
+#include "openvswitch/vconn.h"
+#include "openvswitch/vlog.h"
 #include "ofproto.h"
 #include "ofproto-provider.h"
 #include "pktbuf.h"
-#include "dp-packet.h"
 #include "poll-loop.h"
 #include "rconn.h"
 #include "timeval.h"
-#include "openvswitch/vconn.h"
-#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(fail_open);
 
diff --git a/ofproto/in-band.c b/ofproto/in-band.c
index 9c0499909..efea19fd8 100644
--- a/ofproto/in-band.c
+++ b/ofproto/in-band.c
@@ -15,7 +15,6 @@
  */
 
 #include <config.h>
-#include "in-band.h"
 #include <arpa/inet.h>
 #include <errno.h>
 #include <inttypes.h>
@@ -26,18 +25,19 @@
 #include "classifier.h"
 #include "dhcp.h"
 #include "flow.h"
+#include "in-band.h"
 #include "netdev.h"
 #include "netlink.h"
 #include "odp-util.h"
-#include "ofp-actions.h"
 #include "ofproto.h"
-#include "openvswitch/ofpbuf.h"
 #include "ofproto-provider.h"
 #include "openflow/openflow.h"
+#include "openvswitch/ofp-actions.h"
+#include "openvswitch/ofpbuf.h"
+#include "openvswitch/vlog.h"
 #include "packets.h"
 #include "poll-loop.h"
 #include "timeval.h"
-#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(in_band);
 
diff --git a/ofproto/ofproto-dpif-rid.h b/ofproto/ofproto-dpif-rid.h
index 287663a9f..3efd85ebd 100644
--- a/ofproto/ofproto-dpif-rid.h
+++ b/ofproto/ofproto-dpif-rid.h
@@ -21,9 +21,9 @@
 #include <stdint.h>
 
 #include "cmap.h"
-#include "openvswitch/list.h"
-#include "ofp-actions.h"
 #include "ofproto-dpif-mirror.h"
+#include "openvswitch/list.h"
+#include "openvswitch/ofp-actions.h"
 #include "ovs-thread.h"
 #include "uuid.h"
 
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index a4fa09fb0..48674a2ae 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -22,7 +22,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include "tnl-neigh-cache.h"
 #include "bfd.h"
 #include "bitmap.h"
 #include "bond.h"
@@ -33,32 +32,33 @@
 #include "coverage.h"
 #include "dp-packet.h"
 #include "dpif.h"
-#include "openvswitch/dynamic-string.h"
 #include "in-band.h"
 #include "lacp.h"
 #include "learn.h"
-#include "openvswitch/list.h"
-#include "ovs-lldp.h"
 #include "mac-learning.h"
 #include "mcast-snooping.h"
-#include "openvswitch/meta-flow.h"
 #include "multipath.h"
 #include "netdev-vport.h"
 #include "netlink.h"
 #include "nx-match.h"
 #include "odp-execute.h"
-#include "ofp-actions.h"
 #include "ofproto/ofproto-dpif-ipfix.h"
 #include "ofproto/ofproto-dpif-mirror.h"
 #include "ofproto/ofproto-dpif-monitor.h"
 #include "ofproto/ofproto-dpif-sflow.h"
 #include "ofproto/ofproto-dpif.h"
 #include "ofproto/ofproto-provider.h"
-#include "packets.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/meta-flow.h"
+#include "openvswitch/list.h"
+#include "openvswitch/ofp-actions.h"
+#include "openvswitch/vlog.h"
+#include "ovs-lldp.h"
 #include "ovs-router.h"
+#include "packets.h"
+#include "tnl-neigh-cache.h"
 #include "tnl-ports.h"
 #include "tunnel.h"
-#include "openvswitch/vlog.h"
 
 COVERAGE_DEFINE(xlate_actions);
 COVERAGE_DEFINE(xlate_actions_oversize);
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 99ed72381..9975ffb20 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -15,10 +15,6 @@
  */
 
 #include <config.h>
-
-#include "ofproto/ofproto-dpif.h"
-#include "ofproto/ofproto-provider.h"
-
 #include <errno.h>
 
 #include "bfd.h"
@@ -29,9 +25,7 @@
 #include "connmgr.h"
 #include "coverage.h"
 #include "cfm.h"
-#include "ovs-lldp.h"
 #include "dpif.h"
-#include "openvswitch/dynamic-string.h"
 #include "fail-open.h"
 #include "guarded-list.h"
 #include "hmapx.h"
@@ -39,7 +33,6 @@
 #include "learn.h"
 #include "mac-learning.h"
 #include "mcast-snooping.h"
-#include "openvswitch/meta-flow.h"
 #include "multipath.h"
 #include "netdev-vport.h"
 #include "netdev.h"
@@ -47,10 +40,9 @@
 #include "nx-match.h"
 #include "odp-util.h"
 #include "odp-execute.h"
-#include "openvswitch/ofp-util.h"
-#include "openvswitch/ofpbuf.h"
-#include "ofp-actions.h"
 #include "ofp-print.h"
+#include "ofproto/ofproto-dpif.h"
+#include "ofproto/ofproto-provider.h"
 #include "ofproto-dpif-ipfix.h"
 #include "ofproto-dpif-mirror.h"
 #include "ofproto-dpif-monitor.h"
@@ -58,9 +50,17 @@
 #include "ofproto-dpif-sflow.h"
 #include "ofproto-dpif-upcall.h"
 #include "ofproto-dpif-xlate.h"
-#include "poll-loop.h"
+#include "openvswitch/ofp-actions.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/meta-flow.h"
+#include "openvswitch/ofp-parse.h"
+#include "openvswitch/ofp-util.h"
+#include "openvswitch/ofpbuf.h"
+#include "openvswitch/vlog.h"
+#include "ovs-lldp.h"
 #include "ovs-rcu.h"
 #include "ovs-router.h"
+#include "poll-loop.h"
 #include "seq.h"
 #include "simap.h"
 #include "smap.h"
@@ -69,8 +69,6 @@
 #include "unaligned.h"
 #include "unixctl.h"
 #include "vlan-bitmap.h"
-#include "openvswitch/ofp-parse.h"
-#include "openvswitch/vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(ofproto_dpif);
 
diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h
index 9d1a4b1b3..daa0077f4 100644
--- a/ofproto/ofproto-provider.h
+++ b/ofproto/ofproto-provider.h
@@ -38,10 +38,10 @@
 #include "guarded-list.h"
 #include "heap.h"
 #include "hindex.h"
+#include "ofproto/ofproto.h"
 #include "openvswitch/list.h"
-#include "ofp-actions.h"
+#include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-util.h"
-#include "ofproto/ofproto.h"
 #include "openvswitch/ofp-errors.h"
 #include "ovs-atomic.h"
 #include "ovs-rcu.h"
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index f6c0203df..fa766f6bd 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -16,36 +16,38 @@
  */
 
 #include <config.h>
-#include "ofproto.h"
 #include <errno.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <unistd.h>
+
 #include "bitmap.h"
+#include "bundles.h"
 #include "byte-order.h"
 #include "classifier.h"
 #include "connectivity.h"
 #include "connmgr.h"
 #include "coverage.h"
+#include "dp-packet.h"
 #include "hash.h"
 #include "hmap.h"
 #include "netdev.h"
 #include "nx-match.h"
-#include "ofp-actions.h"
 #include "ofp-print.h"
+#include "ofproto.h"
 #include "ofproto-provider.h"
 #include "openflow/nicira-ext.h"
 #include "openflow/openflow.h"
 #include "openvswitch/dynamic-string.h"
 #include "openvswitch/meta-flow.h"
+#include "openvswitch/ofp-actions.h"
 #include "openvswitch/ofp-errors.h"
 #include "openvswitch/ofp-msgs.h"
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
 #include "openvswitch/vlog.h"
 #include "ovs-rcu.h"
-#include "dp-packet.h"
 #include "packets.h"
 #include "pinsched.h"
 #include "pktbuf.h"
@@ -60,7 +62,6 @@
 #include "tun-metadata.h"
 #include "unaligned.h"
 #include "unixctl.h"
-#include "bundles.h"
 
 VLOG_DEFINE_THIS_MODULE(ofproto);