diff options
| author | Samuel Ghinet <sghinet@cloudbasesolutions.com> | 2014-09-25 21:20:25 +0000 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2014-09-26 10:21:34 -0700 |
| commit | e00afcf6427ab3b99c6ad0867c2a22bfe9ead180 (patch) | |
| tree | 7bdcc7d23a609976e6faf73944a0b9cef79f8afa /datapath-windows/ovsext/Vxlan.c | |
| parent | 260f76b7e3cf6bd52a2a80d5186f2a68b0123017 (diff) | |
| download | openvswitch-e00afcf6427ab3b99c6ad0867c2a22bfe9ead180.tar.gz | |
datapath-windows: fix OVS_VPORT_TYPE
The windows ovs kernel uses an OVS_VPORT_TYPE enum that is incompatible with
the userspace counterpart (enum ovs_vport_type from openvswitch.h). We must use
the same enum type for the netlink communication to work properly.
This patch makes the fix: "typedef enum ovs_vport_type OVS_VPORT_TYPE" and
changes the afferent kernel driver code:
o) vport types synthetic and emulated turn to: netdev
o) vport type internal turns to: internal
o) vport type external truns to: netdev (plus, we hold a field in vport,
"isExternal"
Signed-off-by: Samuel Ghinet <sghinet@cloudbasesolutions.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'datapath-windows/ovsext/Vxlan.c')
| -rw-r--r-- | datapath-windows/ovsext/Vxlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/datapath-windows/ovsext/Vxlan.c b/datapath-windows/ovsext/Vxlan.c index 3a1291ca3..7f94634f9 100644 --- a/datapath-windows/ovsext/Vxlan.c +++ b/datapath-windows/ovsext/Vxlan.c @@ -57,7 +57,7 @@ OvsInitVxlanTunnel(POVS_VPORT_ENTRY vport, POVS_VXLAN_VPORT vxlanPort; NTSTATUS status = STATUS_SUCCESS; - ASSERT(addReq->type == OVSWIN_VPORT_TYPE_VXLAN); + ASSERT(addReq->type == OVS_VPORT_TYPE_VXLAN); vxlanPort = OvsAllocateMemory(sizeof (*vxlanPort)); if (vxlanPort == NULL) { @@ -80,7 +80,7 @@ OvsInitVxlanTunnel(POVS_VPORT_ENTRY vport, VOID OvsCleanupVxlanTunnel(POVS_VPORT_ENTRY vport) { - if (vport->ovsType != OVSWIN_VPORT_TYPE_VXLAN || + if (vport->ovsType != OVS_VPORT_TYPE_VXLAN || vport->priv == NULL) { return; } |