From a946b636edd932994a8972cf23168e4c08b21e8e Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 29 Sep 2011 15:18:58 -0700 Subject: [PATCH] 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.) --- lib/flow.h | 1 - lib/netdev-linux.h | 1 - ofproto/connmgr.h | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/flow.h b/lib/flow.h index 6212f845..a593516d 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 c00a846b..c8caa4e3 100644 --- a/lib/netdev-linux.h +++ b/lib/netdev-linux.h @@ -19,7 +19,6 @@ #include #include -#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 ea39b724..02243526 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; -- 2.30.2