summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/openvswitch/automake.mk1
-rw-r--r--include/openvswitch/match.h (renamed from lib/match.h)10
-rw-r--r--lib/automake.mk1
-rw-r--r--lib/classifier.h2
-rw-r--r--lib/dpctl.c2
-rw-r--r--lib/dpif-netdev.c2
-rw-r--r--lib/flow.c2
-rw-r--r--lib/learn.c2
-rw-r--r--lib/match.c3
-rw-r--r--lib/ofp-util.h2
-rw-r--r--lib/tun-metadata.c2
-rw-r--r--ofproto/bond.c2
-rw-r--r--ofproto/connmgr.h2
-rw-r--r--ovn/controller/ofctrl.c2
-rw-r--r--ovn/controller/physical.c2
-rw-r--r--ovn/lib/expr.c2
-rw-r--r--ovn/lib/expr.h2
-rw-r--r--tests/test-odp.c2
-rw-r--r--tests/test-ovn.c2
19 files changed, 23 insertions, 22 deletions
diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
index 6d93b26ed..b64b6c15d 100644
--- a/include/openvswitch/automake.mk
+++ b/include/openvswitch/automake.mk
@@ -6,6 +6,7 @@ openvswitchinclude_HEADERS = \
include/openvswitch/geneve.h \
include/openvswitch/list.h \
include/openvswitch/netdev.h \
+ include/openvswitch/match.h \
include/openvswitch/ofpbuf.h \
include/openvswitch/ofp-errors.h \
include/openvswitch/ofp-parse.h \
diff --git a/lib/match.h b/include/openvswitch/match.h
index 0a6ac29ce..c955753d7 100644
--- a/lib/match.h
+++ b/include/openvswitch/match.h
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-#ifndef MATCH_H
-#define MATCH_H 1
+#ifndef OPENVSWITCH_MATCH_H
+#define OPENVSWITCH_MATCH_H 1
-#include "flow.h"
-#include "packets.h"
-#include "tun-metadata.h"
+#include "openvswitch/flow.h"
+#include "openvswitch/packets.h"
+#include "openvswitch/tun-metadata.h"
struct ds;
diff --git a/lib/automake.mk b/lib/automake.mk
index 7b829d0db..b9e26e40d 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -115,7 +115,6 @@ lib_libopenvswitch_la_SOURCES = \
lib/mac-learning.c \
lib/mac-learning.h \
lib/match.c \
- lib/match.h \
lib/mcast-snooping.c \
lib/mcast-snooping.h \
lib/memory.c \
diff --git a/lib/classifier.h b/lib/classifier.h
index 889dc1e58..975a4f07e 100644
--- a/lib/classifier.h
+++ b/lib/classifier.h
@@ -299,7 +299,7 @@
* parallel to the rule's removal. */
#include "cmap.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "meta-flow.h"
#include "pvector.h"
#include "rculist.h"
diff --git a/lib/dpctl.c b/lib/dpctl.c
index 5f7003127..11b6ed0e4 100644
--- a/lib/dpctl.c
+++ b/lib/dpctl.c
@@ -34,7 +34,7 @@
#include "dpif.h"
#include "openvswitch/dynamic-string.h"
#include "flow.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "netdev.h"
#include "netdev-dpdk.h"
#include "netlink.h"
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index 2870951fe..b14d641d2 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -45,7 +45,7 @@
#include "hmapx.h"
#include "latch.h"
#include "openvswitch/list.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "netdev.h"
#include "netdev-dpdk.h"
#include "netdev-vport.h"
diff --git a/lib/flow.c b/lib/flow.c
index b9ce3311d..560a90f20 100644
--- a/lib/flow.c
+++ b/lib/flow.c
@@ -32,7 +32,7 @@
#include "openvswitch/dynamic-string.h"
#include "hash.h"
#include "jhash.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "dp-packet.h"
#include "openflow/openflow.h"
#include "packets.h"
diff --git a/lib/learn.c b/lib/learn.c
index ca0cb6b16..af8e1e86e 100644
--- a/lib/learn.c
+++ b/lib/learn.c
@@ -21,7 +21,7 @@
#include "byte-order.h"
#include "colors.h"
#include "openvswitch/dynamic-string.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "meta-flow.h"
#include "nx-match.h"
#include "ofp-actions.h"
diff --git a/lib/match.c b/lib/match.c
index fd571d91a..42955b804 100644
--- a/lib/match.c
+++ b/lib/match.c
@@ -15,8 +15,9 @@
*/
#include <config.h>
-#include "match.h"
+#include "openvswitch/match.h"
#include <stdlib.h>
+#include "flow.h"
#include "byte-order.h"
#include "colors.h"
#include "openvswitch/dynamic-string.h"
diff --git a/lib/ofp-util.h b/lib/ofp-util.h
index 379257c41..0e5b440b6 100644
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -24,7 +24,7 @@
#include "compiler.h"
#include "flow.h"
#include "openvswitch/list.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "meta-flow.h"
#include "netdev.h"
#include "openflow/netronome-ext.h"
diff --git a/lib/tun-metadata.c b/lib/tun-metadata.c
index 1e6ef4684..77688701d 100644
--- a/lib/tun-metadata.c
+++ b/lib/tun-metadata.c
@@ -21,7 +21,7 @@
#include "bitmap.h"
#include "compiler.h"
#include "hmap.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "nx-match.h"
#include "odp-netlink.h"
#include "ofp-util.h"
diff --git a/ofproto/bond.c b/ofproto/bond.c
index f668a24f1..27c4c922b 100644
--- a/ofproto/bond.c
+++ b/ofproto/bond.c
@@ -43,7 +43,7 @@
#include "dp-packet.h"
#include "poll-loop.h"
#include "seq.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "shash.h"
#include "timeval.h"
#include "unixctl.h"
diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
index 637ad170c..5b424994b 100644
--- a/ofproto/connmgr.h
+++ b/ofproto/connmgr.h
@@ -20,7 +20,7 @@
#include "classifier.h"
#include "hmap.h"
#include "openvswitch/list.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "ofp-util.h"
#include "ofproto.h"
#include "ofproto-provider.h"
diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c
index 55ca98dd2..b0f0932ae 100644
--- a/ovn/controller/ofctrl.c
+++ b/ovn/controller/ofctrl.c
@@ -18,7 +18,7 @@
#include "dirs.h"
#include "openvswitch/dynamic-string.h"
#include "hmap.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "ofp-actions.h"
#include "ofp-msgs.h"
#include "ofp-print.h"
diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c
index a210b396a..3276e2e9b 100644
--- a/ovn/controller/physical.c
+++ b/ovn/controller/physical.c
@@ -16,7 +16,7 @@
#include <config.h>
#include "physical.h"
#include "lflow.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "ofctrl.h"
#include "ofp-actions.h"
#include "openvswitch/ofpbuf.h"
diff --git a/ovn/lib/expr.c b/ovn/lib/expr.c
index aae5df6c1..c4a600fda 100644
--- a/ovn/lib/expr.c
+++ b/ovn/lib/expr.c
@@ -20,7 +20,7 @@
#include "json.h"
#include "lex.h"
#include "logical-fields.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "ofp-actions.h"
#include "shash.h"
#include "simap.h"
diff --git a/ovn/lib/expr.h b/ovn/lib/expr.h
index fa7ccbebb..372577152 100644
--- a/ovn/lib/expr.h
+++ b/ovn/lib/expr.h
@@ -56,7 +56,7 @@
#include "lex.h"
#include "hmap.h"
#include "openvswitch/list.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "meta-flow.h"
struct ds;
diff --git a/tests/test-odp.c b/tests/test-odp.c
index b1e20c3e9..602a6b611 100644
--- a/tests/test-odp.c
+++ b/tests/test-odp.c
@@ -20,7 +20,7 @@
#include <stdio.h>
#include "openvswitch/dynamic-string.h"
#include "flow.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "openvswitch/ofpbuf.h"
#include "ovstest.h"
#include "util.h"
diff --git a/tests/test-ovn.c b/tests/test-ovn.c
index 92906922c..52e0ac322 100644
--- a/tests/test-ovn.c
+++ b/tests/test-ovn.c
@@ -21,7 +21,7 @@
#include <sys/wait.h>
#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
-#include "match.h"
+#include "openvswitch/match.h"
#include "ofp-actions.h"
#include "openvswitch/ofpbuf.h"
#include "ovn/lib/actions.h"
View Lorry Controller Status