refresh

diff --git a/meta b/meta
index cdf5e567923e3d34c4d43a61bb622bb114978752..0f0a42cceaecf2cac0a64682fba99bbc1730882c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 12c56f70e7120e595d0dd51b6fb3d97118caeb60
-Head: d3013516b58616d8e0210476fda6b1b547eb2428
+Previous: 98d8541766968415a0ccfbbf45942ae7be146e41
+Head: eebff940fddf2bb020bb1dc49ba68eaa3d3c7e3b
 Applied:
-  dapl-qp: 1dd48d3a2863b80e7a25d9366fc7000d80c2d6a4
-  refresh-temp: d3013516b58616d8e0210476fda6b1b547eb2428
+  dapl-qp: eebff940fddf2bb020bb1dc49ba68eaa3d3c7e3b
 Unapplied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa

diff --git a/patches/dapl-qp b/patches/dapl-qp
index 10420b714a6f95bf74227117f171f26a3977b897..f9cdcc54d337e2ac58ab17dc178bd046bdb65597 100644 (file)
--- a/patches/dapl-qp
+++ b/patches/dapl-qp
@@ -1,5 +1,5 @@
 Bottom: e0a336baf5ecfc37b867ad87df4aa629ac448200
-Top:    e0a336baf5ecfc37b867ad87df4aa629ac448200
+Top:    82f215e8052d95a49ebdf8c0e068d1563f33b52a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-09-09 10:41:28 -0700
 
@@ -15,4 +15,35 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
+index f52f5da..ab8488b 100644
+--- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
++++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
+@@ -295,7 +295,6 @@ dapls_ib_qp_alloc (
+     return (DAT_SUCCESS);
+ }
+ 
+-
+ /*
+  * dapls_ib_qp_free
+  *
+@@ -325,16 +324,18 @@ dapls_ib_qp_free (
+                       ep_ptr->qp_handle,
+                       ib_get_port_state_str(ep_ptr->qp_state));
+ 
++      dapl_os_lock(&ep_ptr->header.lock);
+       if (( ep_ptr->qp_handle != IB_INVALID_HANDLE ) &&
+           ( ep_ptr->qp_state != DAPL_QP_STATE_UNATTACHED ))
+       {
+               qp_handle = ep_ptr->qp_handle;
+               ep_ptr->qp_handle = IB_INVALID_HANDLE;
+               ep_ptr->qp_state = DAPL_QP_STATE_UNATTACHED;
+-              ib_destroy_qp ( qp_handle, NULL /* callback */);
++              ib_destroy_qp ( qp_handle, ib_sync_destroy );
+               dapl_dbg_log (DAPL_DBG_TYPE_EP, "--> DsQF: freed QP %p\n",
+                               qp_handle ); 
+       }
++      dapl_os_unlock(&ep_ptr->header.lock);
+ 
+     return DAT_SUCCESS;
+ }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1460837..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,41 +0,0 @@
-Bottom: e0a336baf5ecfc37b867ad87df4aa629ac448200
-Top:    82f215e8052d95a49ebdf8c0e068d1563f33b52a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-09-09 13:32:52 -0700
-
-Refresh of dapl-qp
-
----
-
-diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
-index f52f5da..ab8488b 100644
---- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
-+++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
-@@ -295,7 +295,6 @@ dapls_ib_qp_alloc (
-     return (DAT_SUCCESS);
- }
- 
--
- /*
-  * dapls_ib_qp_free
-  *
-@@ -325,16 +324,18 @@ dapls_ib_qp_free (
-                       ep_ptr->qp_handle,
-                       ib_get_port_state_str(ep_ptr->qp_state));
- 
-+      dapl_os_lock(&ep_ptr->header.lock);
-       if (( ep_ptr->qp_handle != IB_INVALID_HANDLE ) &&
-           ( ep_ptr->qp_state != DAPL_QP_STATE_UNATTACHED ))
-       {
-               qp_handle = ep_ptr->qp_handle;
-               ep_ptr->qp_handle = IB_INVALID_HANDLE;
-               ep_ptr->qp_state = DAPL_QP_STATE_UNATTACHED;
--              ib_destroy_qp ( qp_handle, NULL /* callback */);
-+              ib_destroy_qp ( qp_handle, ib_sync_destroy );
-               dapl_dbg_log (DAPL_DBG_TYPE_EP, "--> DsQF: freed QP %p\n",
-                               qp_handle ); 
-       }
-+      dapl_os_unlock(&ep_ptr->header.lock);
- 
-     return DAT_SUCCESS;
- }