From: Ben Pfaff <blp@nicira.com>
Date: Thu, 29 Sep 2011 22:18:58 +0000 (-0700)
Subject: Remove a pair of unnecessary dependencies on datapath-protocol.h.
X-Git-Tag: v1.3.0~164
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a946b636edd932994a8972cf23168e4c08b21e8e;p=sliver-openvswitch.git

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 6212f8453..a593516da 100644
--- 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 c00a846b4..c8caa4e3c 100644
--- 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 ea39b724e..022435265 100644
--- 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;