From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 22 Sep 2010 23:34:56 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=128eaf52eaed4f9bc1bd339a3532ded1b041f24f;p=~shefty%2Frdma-win.git

refresh
---

diff --git a/meta b/meta
index 9a748dac..7b7c5b17 100644
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: f47de666b0807f55725782b6ad6ee88da7d1c549
-Head: fe515fb53f0562a02572129d8ffb5695e03973e7
+Previous: 7e38884952d8c72d4d995fbab71c3e8ad3782e08
+Head: dba881d08766e12ba2863c4f57b6a1877b5a8ecf
 Applied:
   dapl-update: 2df1438b75e945d48a63fbda74079a77978f315d
   cma-priv-data: 83299e9a772068a302a4d39ff4e7ba45d4bd26b5
   ibal-disc: 8f7a7706a406a409c2684a4550476d901f94eaaf
-  dapl-cookie: c48a573738102e68b380ce621bf4c4241b107808
-  refresh-temp: fe515fb53f0562a02572129d8ffb5695e03973e7
+  dapl-cookie: dba881d08766e12ba2863c4f57b6a1877b5a8ecf
 Unapplied:
   dapl-evd: ede541a6ba3d7d2a69f95b691f69eb9a315bb75d
   overlap: dfe75689835ce5dc1dbe80fd8c8ca144db6383b9
diff --git a/patches/dapl-cookie b/patches/dapl-cookie
index 2a4a2b91..d41329d2 100644
--- a/patches/dapl-cookie
+++ b/patches/dapl-cookie
@@ -1,5 +1,5 @@
 Bottom: 157f097bdc8ab478f6f58758453fd1ad23c99b34
-Top:    157f097bdc8ab478f6f58758453fd1ad23c99b34
+Top:    dad023a9c768a848934c62b7039d22632799864e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-09-22 10:45:09 -0700
 
@@ -8,4 +8,32 @@ dapl: fix invalid cookie issue
 
 ---
 
-
+diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_util.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_util.c
+index 0852df2..37b174f 100644
+--- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_util.c
++++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_util.c
+@@ -1805,6 +1805,7 @@ dapls_ib_completion_poll ( IN DAPL_HCA                *p_hca,
+ {
+     ib_api_status_t        ib_status;
+     ib_work_completion_t   *cqe_filled;
++uint64_t wrid;
+ 
+     /*
+      * FIXME - Vu
+@@ -1816,12 +1817,16 @@ dapls_ib_completion_poll ( IN DAPL_HCA                *p_hca,
+     cqe_ptr->p_next = NULL;
+     cqe_filled      = NULL;
+ 
++wrid = cqe_ptr->wr_id;
+     if  ( !p_hca->ib_hca_handle )
+     {
+         return DAT_INVALID_HANDLE;
+     }
+ 
+     ib_status = ib_poll_cq (p_evd->ib_cq_handle, &cqe_ptr, &cqe_filled);
++if (ib_status == IB_SUCCESS) {
++	printf("ib_poll_cq status 0x%x, wr id 0x%llx 0x%llx\n", cqe_ptr->status, wrid, cqe_ptr->wr_id);
++}
+ 
+     if ( ib_status == IB_INVALID_CQ_HANDLE )
+     {
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 4a607c4d..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,38 +0,0 @@
-Bottom: 157f097bdc8ab478f6f58758453fd1ad23c99b34
-Top:    dad023a9c768a848934c62b7039d22632799864e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-09-22 16:34:47 -0700
-
-Refresh of dapl-cookie
-
----
-
-diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_util.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_util.c
-index 0852df2..37b174f 100644
---- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_util.c
-+++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_util.c
-@@ -1805,6 +1805,7 @@ dapls_ib_completion_poll ( IN DAPL_HCA                *p_hca,
- {
-     ib_api_status_t        ib_status;
-     ib_work_completion_t   *cqe_filled;
-+uint64_t wrid;
- 
-     /*
-      * FIXME - Vu
-@@ -1816,12 +1817,16 @@ dapls_ib_completion_poll ( IN DAPL_HCA                *p_hca,
-     cqe_ptr->p_next = NULL;
-     cqe_filled      = NULL;
- 
-+wrid = cqe_ptr->wr_id;
-     if  ( !p_hca->ib_hca_handle )
-     {
-         return DAT_INVALID_HANDLE;
-     }
- 
-     ib_status = ib_poll_cq (p_evd->ib_cq_handle, &cqe_ptr, &cqe_filled);
-+if (ib_status == IB_SUCCESS) {
-+	printf("ib_poll_cq status 0x%x, wr id 0x%llx 0x%llx\n", cqe_ptr->status, wrid, cqe_ptr->wr_id);
-+}
- 
-     if ( ib_status == IB_INVALID_CQ_HANDLE )
-     {