From 6aed564bc536972bafeed27253e17bc71d6705bf Mon Sep 17 00:00:00 2001
From: leonidk <leonidk@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Tue, 18 Sep 2007 09:41:59 +0000
Subject: [PATCH] [IBAL] fixed a bug in the error flow of NDI CQ creation

git-svn-id: svn://openib.tc.cornell.edu/gen1@802 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 branches/Ndi/core/al/al_cq.c               | 11 ++++++-----
 branches/Ndi/core/al/kernel/al_proxy_ndi.c |  2 +-
 branches/Ndi/core/al/kernel/al_proxy_ndi.h |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/branches/Ndi/core/al/al_cq.c b/branches/Ndi/core/al/al_cq.c
index f53de5f2..a1933f3d 100644
--- a/branches/Ndi/core/al/al_cq.c
+++ b/branches/Ndi/core/al/al_cq.c
@@ -99,11 +99,12 @@ create_cq(
 	}
 
 #ifdef CL_KERNEL
-		/* cancel pending IRPS for NDI type CQ */
-		if( !NT_SUCCESS( proxy_ndi_init( h_cq ) ) )
-		{
-			return IB_ERROR;
-		}
+	/* cancel pending IRPS for NDI type CQ */
+	if( !NT_SUCCESS( proxy_ndi_cq_init( h_cq ) ) )
+	{
+		free_cq( &h_cq->obj );
+		return IB_ERROR;
+	}
 #endif
 	
 	if( p_umv_buf )
diff --git a/branches/Ndi/core/al/kernel/al_proxy_ndi.c b/branches/Ndi/core/al/kernel/al_proxy_ndi.c
index f02dc9f2..6af10b05 100644
--- a/branches/Ndi/core/al/kernel/al_proxy_ndi.c
+++ b/branches/Ndi/core/al/kernel/al_proxy_ndi.c
@@ -245,7 +245,7 @@ static VOID __ndi_complete_cancelled_irp(
 }
 
 NTSTATUS
-proxy_ndi_init(
+proxy_ndi_cq_init(
 	IN				ib_cq_handle_t				h_cq )
 {
 
diff --git a/branches/Ndi/core/al/kernel/al_proxy_ndi.h b/branches/Ndi/core/al/kernel/al_proxy_ndi.h
index 37b08857..16d11d9c 100644
--- a/branches/Ndi/core/al/kernel/al_proxy_ndi.h
+++ b/branches/Ndi/core/al/kernel/al_proxy_ndi.h
@@ -69,7 +69,7 @@ proxy_ndi_flush_ques(
 	IN				ib_cq_handle_t				h_cq );
 
 NTSTATUS
-proxy_ndi_init(
+proxy_ndi_cq_init(
 	IN				ib_cq_handle_t				h_cq );
 
 #endif
-- 
2.41.0