diff options
author | Ankur Sharma <ankursharma@vmware.com> | 2014-09-26 17:32:12 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2014-09-29 09:03:41 -0700 |
commit | 08288ce0bd23d5fe87cac47e777ce34d52e74efe (patch) | |
tree | 2328e1a4863facfa58e977a61c39c999d2fd9d21 /datapath-windows/ovsext | |
parent | 4464b71eb45cd44b7cc822097473147b161eecc7 (diff) | |
download | openvswitch-08288ce0bd23d5fe87cac47e777ce34d52e74efe.tar.gz |
datapath-windows: move OVS_MESSAGE to Netlink.h
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 <ankursharma@vmware.com>
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Acked-by: Eitan Eliahu <eliahue@vmware.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Acked-by: Samuel Ghinet <sghinet@cloudbasesolutions.com>
Tested-by: Ankur Sharma <ankursharma@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'datapath-windows/ovsext')
-rw-r--r-- | datapath-windows/ovsext/Datapath.h | 10 | ||||
-rw-r--r-- | 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 73e6654ee..689e0aede 100644 --- a/datapath-windows/ovsext/Datapath.h +++ b/datapath-windows/ovsext/Datapath.h @@ -29,16 +29,6 @@ #define __DATAPATH_H_ 1 /* - * Structure of a general 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; - -/* * Structure of an error message sent as a reply from kernel. */ typedef struct _OVS_MESSAGE_ERROR { diff --git a/datapath-windows/ovsext/Netlink/Netlink.h b/datapath-windows/ovsext/Netlink/Netlink.h index 6ecbdc5db..b03672334 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 |