[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

diff --git a/branches/Ndi/core/al/al_cq.c b/branches/Ndi/core/al/al_cq.c
index f53de5f2a58e38d5ede5e9ce601e3aec6f57196e..a1933f3d894b8a3a40618966f38a14e4c2cec623 100644 (file)
--- a/branches/Ndi/core/al/al_cq.c
+++ b/branches/Ndi/core/al/al_cq.c
@@ -99,11 +99,12 @@ create_cq(
        }\r
 \r
 #ifdef CL_KERNEL\r
-               /* cancel pending IRPS for NDI type CQ */\r
-               if( !NT_SUCCESS( proxy_ndi_init( h_cq ) ) )\r
-               {\r
-                       return IB_ERROR;\r
-               }\r
+       /* cancel pending IRPS for NDI type CQ */\r
+       if( !NT_SUCCESS( proxy_ndi_cq_init( h_cq ) ) )\r
+       {\r
+               free_cq( &h_cq->obj );\r
+               return IB_ERROR;\r
+       }\r
 #endif\r
        \r
        if( p_umv_buf )\r

diff --git a/branches/Ndi/core/al/kernel/al_proxy_ndi.c b/branches/Ndi/core/al/kernel/al_proxy_ndi.c
index f02dc9f2d8ae94b937cecf41846dc58cf395df9c..6af10b0584a1e09f33c56cc984a982e7a4360b7f 100644 (file)
--- 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 37b08857d6101a010b90c9631285b8d07fdd9e67..16d11d9c22a9bb201a038ecbf0e3902f835bb868 100644 (file)
--- 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