Skip to content

Commit

Permalink
datapath-windows: Nuke USE_NEW_VPORT_ADD_WORKFLOW.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
nithinrajub authored and blp committed Oct 31, 2014
1 parent 3bfe44a commit 541328f
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions datapath-windows/ovsext/Vport.c
Expand Up @@ -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)
Expand All @@ -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);
}
Expand Down Expand Up @@ -1252,21 +1242,16 @@ 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);
if (status != STATUS_SUCCESS) {
OVS_LOG_INFO("Fail to convert NIC name.");
extInfo->vmUUID[0] = 0;
}
#endif

status = OvsConvertIfCountedStrToAnsiStr(&vport->vmName,
extInfo->vmUUID,
Expand Down

0 comments on commit 541328f

Please sign in to comment.