diff options
| author | Nithin Raju <nithin@vmware.com> | 2014-10-29 15:18:17 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2014-10-31 13:58:55 -0700 |
| commit | 541328f171e21acd393af981394ba93176438ae8 (patch) | |
| tree | 366032c51b951cd0592d89250650989faa29c1f7 /datapath-windows | |
| parent | 3bfe44a47d510980f8da4c81a8b6cf17d9dfeaf3 (diff) | |
| download | openvswitch-541328f171e21acd393af981394ba93176438ae8.tar.gz | |
datapath-windows: Nuke USE_NEW_VPORT_ADD_WORKFLOW.
We were using USE_NEW_VPORT_ADD_WORKFLOW while transitioning from old
workflow for adding ports. We don't need it anymore.
Signed-off-by: Nithin Raju <nithin@vmware.com>
Acked-by: Eitan Eliahu <eliahue@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'datapath-windows')
| -rw-r--r-- | datapath-windows/ovsext/Vport.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/datapath-windows/ovsext/Vport.c b/datapath-windows/ovsext/Vport.c index d951d088f..b28336bd5 100644 --- a/datapath-windows/ovsext/Vport.c +++ b/datapath-windows/ovsext/Vport.c @@ -1179,11 +1179,6 @@ OvsConvertIfCountedStrToAnsiStr(PIF_COUNTED_STRING wStr, } -/* - * XXX: Get rid of USE_NEW_VPORT_ADD_WORKFLOW while checking in the code for - * new vport add workflow, or set USE_NEW_VPORT_ADD_WORKFLOW to 1. - */ -#define USE_NEW_VPORT_ADD_WORKFLOW 1 NTSTATUS OvsGetExtInfoIoctl(POVS_VPORT_GET vportGet, POVS_VPORT_EXT_INFO extInfo) @@ -1199,12 +1194,7 @@ OvsGetExtInfoIoctl(POVS_VPORT_GET vportGet, NDIS_RWL_AT_DISPATCH_LEVEL); if (vportGet->portNo == 0) { StringCbLengthA(vportGet->name, OVS_MAX_PORT_NAME_LENGTH - 1, &len); -#if USE_NEW_VPORT_ADD_WORKFLOW == 0 - vport = OvsFindVportByOvsName(gOvsSwitchContext, vportGet->name, - (UINT32)len); -#else vport = OvsFindVportByHvName(gOvsSwitchContext, vportGet->name); -#endif } else { vport = OvsFindVportByPortNo(gOvsSwitchContext, vportGet->portNo); } @@ -1252,13 +1242,9 @@ OvsGetExtInfoIoctl(POVS_VPORT_GET vportGet, extInfo->vmUUID[0] = 0; extInfo->vifUUID[0] = 0; } -#if USE_NEW_VPORT_ADD_WORKFLOW == 0 - RtlCopyMemory(extInfo->name, vport->ovsName, vport->ovsNameLen + 1); -#endif NdisReleaseRWLock(gOvsSwitchContext->dispatchLock, &lockState); NdisReleaseSpinLock(gOvsCtrlLock); if (doConvert) { -#if USE_NEW_VPORT_ADD_WORKFLOW == 1 status = OvsConvertIfCountedStrToAnsiStr(&vport->portFriendlyName, extInfo->name, OVS_MAX_PORT_NAME_LENGTH); @@ -1266,7 +1252,6 @@ OvsGetExtInfoIoctl(POVS_VPORT_GET vportGet, OVS_LOG_INFO("Fail to convert NIC name."); extInfo->vmUUID[0] = 0; } -#endif status = OvsConvertIfCountedStrToAnsiStr(&vport->vmName, extInfo->vmUUID, |