pop

diff --git a/meta b/meta
index 01db8ddbe9a4e7ca47a1d32393addceb10d58e12..780abf0bc908c11ecfe23c13875d1ae42fc4cb64 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: 187993d929bd1342ec61629ac5717bc5c2c14b18
-Head: 5e3dce5f0fbd6b8c466450753b6b1546acc6e885
+Previous: da88c8098b15945b22b169b22405e1876712f97e
+Head: 366088beffef8711b6bf8356ef8e3445a1d21343
 Applied:
   dapl-update: 2df1438b75e945d48a63fbda74079a77978f315d
   cma-priv-data: 83299e9a772068a302a4d39ff4e7ba45d4bd26b5
   ibal-disc: 5e3dce5f0fbd6b8c466450753b6b1546acc6e885
+  ibal-drep: 366088beffef8711b6bf8356ef8e3445a1d21343
 Unapplied:
-  ibal-drep: 72e533940aced7ffb2ceeebc5c5b7cdc09a08b7e
   dapl-cookie: dba881d08766e12ba2863c4f57b6a1877b5a8ecf
   dapl-evd: ede541a6ba3d7d2a69f95b691f69eb9a315bb75d
   overlap: dfe75689835ce5dc1dbe80fd8c8ca144db6383b9

diff --git a/patches/ibal-drep b/patches/ibal-drep
index 6e5665b351a7ca8180f7c0aae3060146e56c134d..df3ac715615d4adc6a04cbb0096b43d72b98b83a 100644 (file)
--- a/patches/ibal-drep
+++ b/patches/ibal-drep
@@ -1,4 +1,4 @@
-Bottom: f7f2d544218a134f3c4d7ef793f728f1ee392dbf
+Bottom: 2eb2ded17fbeaeef3ecf8a915d12687b5507d89c
 Top:    d03a34e5e593ef8cb83cb0c43ec3bc6d468d5ee1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-09-23 12:25:29 -0700
@@ -75,40 +75,4 @@ index 6255846..ee360d1 100644
 +      if(     p_cep->remote_comm_id != p_dreq->local_comm_id ||\r
                p_cep->local_qpn != conn_dreq_get_remote_qpn( p_dreq ) )\r
        {\r
-               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("DREQ received that could not be matched.\n") );\r
-diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
-index 37e158b..a638571 100644
---- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
-+++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
-@@ -228,7 +228,8 @@ dapli_ib_cm_dreq_cb (
- {
-     DAPL_EP             *ep_ptr;
-     dp_ib_cm_handle_t cm_ptr;
--    
-+    enum dapl_ibal_cm_state state;
-+ 
-     dapl_os_assert (p_cm_dreq_rec);
- 
-     ep_ptr  = (DAPL_EP * __ptr64) p_cm_dreq_rec->qp_context;
-@@ -275,17 +276,17 @@ dapli_ib_cm_dreq_cb (
- 
-     ep_ptr->param.ep_state = DAT_EP_STATE_DISCONNECT_PENDING;
- 
-+    state = cm_ptr->state;
-     if (cm_ptr->state == IBAL_CM_CONNECT)
-     {
-           cm_ptr->state = IBAL_CM_DREQ;
-           cm_ptr->ib_cm = p_cm_dreq_rec->h_cm_dreq;
-     }
--    else
--    {
--          dapli_send_ib_cm_drep(p_cm_dreq_rec->h_cm_dreq);
--    }
-     dapl_os_unlock (&ep_ptr->header.lock);
- 
-+    if (state == IBAL_CM_DISCONNECT)
-+          dapli_send_ib_cm_drep(p_cm_dreq_rec->h_cm_dreq);
-+
-     if (ep_ptr->cr_ptr)
-     {
-         /* passive side */
+               AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_CM, ("DREQ received that could not be matched.\n") );