Acked-by: Eitan Eliahu <elia...@vmware.com>
-----Original Message-----
From: dev [mailto:dev-boun...@openvswitch.org] On Behalf Of Nithin Raju
Sent: Wednesday, October 29, 2014 3:18 PM
To: dev@openvswitch.org
Subject: [ovs-dev] [PATCH 1/3] 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 <nit...@vmware.com>
---
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 d951d08..b28336b 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,
--
1.7.4.1
_______________________________________________
dev mailing list
dev@openvswitch.org
https://urldefense.proofpoint.com/v1/url?u=http://openvswitch.org/mailman/listinfo/dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=yTvML8OxA42Jb6ViHe7fUXbvPVOYDPVq87w43doxtlY%3D%0A&m=NivSzkAnj8JSJyOb4x%2F0ybjNYYdhh78ldzc56ItOkf0%3D%0A&s=9c61f7f80cdad053c04bedcab567b7c3ac0f9abf25c3291c98ad53663038f34f
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
