From c4d9f9319f1a7956b7b308f65ba57995c5d93c92 Mon Sep 17 00:00:00 2001 From: Anand Kumar Date: Mon, 29 Jan 2018 10:27:59 -0800 Subject: datapath-windows: Refactor conntrack code. Some of the functions and code are refactored so that new conntrack lock can be implemented Signed-off-by: Anand Kumar Acked-by: Alin Gabriel Serdean Signed-off-by: Alin Gabriel Serdean --- datapath-windows/ovsext/Conntrack-nat.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'datapath-windows/ovsext/Conntrack-nat.c') diff --git a/datapath-windows/ovsext/Conntrack-nat.c b/datapath-windows/ovsext/Conntrack-nat.c index c778f1213..7975770db 100644 --- a/datapath-windows/ovsext/Conntrack-nat.c +++ b/datapath-windows/ovsext/Conntrack-nat.c @@ -93,26 +93,23 @@ NTSTATUS OvsNatInit() sizeof(LIST_ENTRY) * NAT_HASH_TABLE_SIZE, OVS_CT_POOL_TAG); if (ovsNatTable == NULL) { - goto failNoMem; + return STATUS_INSUFFICIENT_RESOURCES; } ovsUnNatTable = OvsAllocateMemoryWithTag( sizeof(LIST_ENTRY) * NAT_HASH_TABLE_SIZE, OVS_CT_POOL_TAG); if (ovsUnNatTable == NULL) { - goto freeNatTable; + OvsFreeMemoryWithTag(ovsNatTable, OVS_CT_POOL_TAG); + return STATUS_INSUFFICIENT_RESOURCES; } for (int i = 0; i < NAT_HASH_TABLE_SIZE; i++) { InitializeListHead(&ovsNatTable[i]); InitializeListHead(&ovsUnNatTable[i]); } - return STATUS_SUCCESS; -freeNatTable: - OvsFreeMemoryWithTag(ovsNatTable, OVS_CT_POOL_TAG); -failNoMem: - return STATUS_INSUFFICIENT_RESOURCES; + return STATUS_SUCCESS; } /* -- cgit v1.2.1