summaryrefslogtreecommitdiff
path: root/datapath-windows/ovsext/Switch.c
diff options
context:
space:
mode:
authorNithin Raju <nithin@vmware.com>2014-10-23 17:33:13 -0700
committerBen Pfaff <blp@nicira.com>2014-10-28 08:43:34 -0700
commit35f20164e225240e443b9140313ce75539c841d3 (patch)
treee4835d0a52ea1dfbaf3cfaf11584b2ff06c9cbc7 /datapath-windows/ovsext/Switch.c
parentf16130074152b301515f52867cf9eaa012e4dc54 (diff)
downloadopenvswitch-35f20164e225240e443b9140313ce75539c841d3.tar.gz
datapath-windows: Update vport add code.
In this patch, we make the following updates to the vport add code: 1. Clarify the roles of the different hash tables, so it is easier to read/write code in the future. 2. Update OvsNewVportCmdHandler() to support adding bridge-internal ports. 3. Fixes in OvsNewVportCmdHandler() to support adding external port. Earlier, we'd hit ASSERTs. 4. I could not figure out way to add a port of type OVS_PORT_TYPE_INTERNAL with name "internal" to the confdb using ovs-vsctl.exe. And, this is needed in order to add the Hyper-V internal port from userspace. To workaround this problem, we treat a port of type OVS_PORT_TYPE_NETDEV with name "internal" as a request to add the Hyper-V internal port. This is a workaround. The end result is that there's a discrepancy between the port type in the datpaath v/s confdb, but this has not created any trouble in testing so far. If this ends up becoming an issue, we can mark the Hyper-V internal port to be of type OVS_PORT_TYPE_NETDEV. No harm. 5. Because of changes indicated in #1, we also update the vport dump code to look at the correct hash table for ports added from userspace. 6. Add a OvsGetTunnelVport() for convenience. 7. Update ASSERTs() while cleaning up the switch. 8. Nuke OvsGetExternalVport() and OvsGetExternalMtu(). Signed-off-by: Nithin Raju <nithin@vmware.com> Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> Tested-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> Acked-by: Ankur Sharma <ankursharma@vmware.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'datapath-windows/ovsext/Switch.c')
-rw-r--r--datapath-windows/ovsext/Switch.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/datapath-windows/ovsext/Switch.c b/datapath-windows/ovsext/Switch.c
index a540926e8..2b68037c2 100644
--- a/datapath-windows/ovsext/Switch.c
+++ b/datapath-windows/ovsext/Switch.c
@@ -433,6 +433,7 @@ OvsUninitSwitchContext(POVS_SWITCH_CONTEXT switchContext)
/* We need to do cleanup for tunnel port here. */
ASSERT(switchContext->numHvVports == 0);
+ ASSERT(switchContext->numNonHvVports == 0);
NdisFreeRWLock(switchContext->dispatchLock);
switchContext->dispatchLock = NULL;
@@ -493,12 +494,6 @@ cleanup:
return status;
}
-PVOID
-OvsGetExternalVport()
-{
- return gOvsSwitchContext->virtualExternalVport;
-}
-
/*
* --------------------------------------------------------------------------