Moved the structure OVS_MESSAGE to Netlink.h. This change is done for following reasons.
a. Patch 2 in this series provides a generic API in Netlink.c for creating netlink message. That API needs OVS_MESSAGE. Including Datapath.h in Netlink.c/h gives compilation error. b. OVS_MESSAGE defines netlink messages hence moving it to Netlink.h looked fine to me. Signed-off-by: Ankur Sharma <ankursha...@vmware.com> Acked-by: Alin Gabriel Serdean <aserd...@cloudbasesolutions.com> Acked-by: Eitan Eliahu <elia...@vmware.com> --- datapath-windows/ovsext/Datapath.h | 10 ---------- datapath-windows/ovsext/Netlink/Netlink.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/datapath-windows/ovsext/Datapath.h b/datapath-windows/ovsext/Datapath.h index 4e6c9b1..f77c1e2 100644 --- a/datapath-windows/ovsext/Datapath.h +++ b/datapath-windows/ovsext/Datapath.h @@ -28,16 +28,6 @@ #ifndef __DATAPATH_H_ #define __DATAPATH_H_ 1 -/* - * Structure of any message passed between userspace and kernel. - */ -typedef struct _OVS_MESSAGE { - NL_MSG_HDR nlMsg; - GENL_MSG_HDR genlMsg; - OVS_HDR ovsHdr; - /* Variable length nl_attrs follow. */ -} OVS_MESSAGE, *POVS_MESSAGE; - typedef struct _OVS_DEVICE_EXTENSION { INT numberOpenInstance; INT pidCount; diff --git a/datapath-windows/ovsext/Netlink/Netlink.h b/datapath-windows/ovsext/Netlink/Netlink.h index 6ecbdc5..b036723 100644 --- a/datapath-windows/ovsext/Netlink/Netlink.h +++ b/datapath-windows/ovsext/Netlink/Netlink.h @@ -20,6 +20,17 @@ #include "Types.h" #include "NetlinkProto.h" #include "NetlinkBuf.h" +#include "..\..\include\OvsDpInterface.h" + +/* + * Structure of any message passed between userspace and kernel. + */ +typedef struct _OVS_MESSAGE { + NL_MSG_HDR nlMsg; + GENL_MSG_HDR genlMsg; + OVS_HDR ovsHdr; + /* Variable length nl_attrs follow. */ +} OVS_MESSAGE, *POVS_MESSAGE; /* Netlink attribute types. */ typedef enum -- 1.9.1 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev