Remove a pair of unnecessary dependencies on datapath-protocol.h.

These headers don't really need datapath-protocol.h.  connmgr.h indirectly
used "struct nlattr" from that header, so add a forward declaration.  (The
next commit will remove use of struct nlattr entirely from that header,
since it is not really appropriate.)

diff --git a/lib/flow.h b/lib/flow.h
index 6212f8453a209a548d951da23453f6a0531bbefc..a593516dac04ea221a0c700d542020ee039b9421 100644 (file)
--- a/lib/flow.h
+++ b/lib/flow.h
@@ -24,7 +24,6 @@
 #include "openflow/nicira-ext.h"
 #include "openflow/openflow.h"
 #include "hash.h"
-#include "openvswitch/datapath-protocol.h"
 #include "util.h"
 
 struct dpif_flow_stats;

diff --git a/lib/netdev-linux.h b/lib/netdev-linux.h
index c00a846b41335c0c30413a875336ce9d78d3c2b1..c8caa4e3cd4c220ebe147a2cd44a247e12300a76 100644 (file)
--- a/lib/netdev-linux.h
+++ b/lib/netdev-linux.h
@@ -19,7 +19,6 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "openvswitch/datapath-protocol.h"
 
 /* These functions are Linux specific, so they should be used directly only by
  * Linux-specific code. */

diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
index ea39b724edaa4db6823d7351cbfcd105e6046314..022435265cee77d38253b45aafa1e3b510a7025c 100644 (file)
--- a/ofproto/connmgr.h
+++ b/ofproto/connmgr.h
@@ -23,6 +23,7 @@
 #include "openflow/nicira-ext.h"
 #include "openvswitch/types.h"
 
+struct nlattr;
 struct ofconn;
 struct ofopgroup;
 struct ofputil_flow_removed;