r3063: Updates from DAPL SourceForge: QP state and connection event fix.

Signed-off-by: James Lentini <jlentini@netapp.com>

diff --git a/dapl/common/dapl_cr_accept.c b/dapl/common/dapl_cr_accept.c
index 62fbeb4a25b015933ff6a64ed567cb6f6d0368c3..c30c29e0a898883701019b4ae49bb589c37f9f4c 100644 (file)
--- a/dapl/common/dapl_cr_accept.c
+++ b/dapl/common/dapl_cr_accept.c
@@ -169,22 +169,12 @@ dapl_cr_accept (
        goto bail;
     }
 
+    /* The qp must be attached by this point! */
     if ( ep_ptr->qp_state == DAPL_QP_STATE_UNATTACHED )
     {
-       /*
-        * If we are lazy attaching the QP then we may need to
-        * hook it up here. Typically, we run this code only for
-        * DAT_PSP_PROVIDER_FLAG
-        */
-       dat_status = dapls_ib_qp_alloc ( cr_ptr->header.owner_ia, ep_ptr, ep_ptr );
-
-       if ( dat_status != DAT_SUCCESS)
-       {
-           /* This is not a great error code, but all the spec allows */
-           dapl_os_unlock ( &ep_ptr->header.lock );
-           dat_status = DAT_ERROR (DAT_INVALID_HANDLE,DAT_INVALID_HANDLE_EP);
-           goto bail;
-       }
+        dapl_os_unlock ( &ep_ptr->header.lock );
+        dat_status = DAT_ERROR (DAT_INVALID_HANDLE,DAT_INVALID_HANDLE_EP);
+        goto bail;
     }
 
     entry_ep_state         = ep_ptr->param.ep_state;
@@ -214,7 +204,7 @@ dapl_cr_accept (
             * system error, app termination, perhaps other reasons.
             */
            dat_status = dapls_evd_post_connection_event (
-               ep_ptr->param.request_evd_handle,
+               ep_ptr->param.connect_evd_handle,
                DAT_CONNECTION_EVENT_ACCEPT_COMPLETION_ERROR,
                (DAT_HANDLE) ep_ptr,
                0,