refresh

diff --git a/meta b/meta
index bc34e3620b9df5faa78b3bb158bacfa72c5f9521..4a02af6580ad3d4da679e9ed96f380db4e8f57a7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: c372013549139cc0f025eb1f12fa7bd7f6758212
-Head: dd2d6b4a07d4f268e646d77ab270845a18628fb9
+Previous: f07e99dfb2547d6d9c3d9ccc39df02716e01109b
+Head: e13c7a46d1fab529c3008c37bac955a1d7738195
 Applied:
-  dapl-debug: aabcb063a871dbeaab35488728fb749d513bf347
-  refresh-temp: dd2d6b4a07d4f268e646d77ab270845a18628fb9
+  dapl-debug: e13c7a46d1fab529c3008c37bac955a1d7738195
 Unapplied:
   dapl-close: 81beb1f83c87c85a473f9cc153ec564e6d832f57
   librdmacm-pdata: 89539a28633f55a8c9da242850123c56f3a2b303

diff --git a/patches/dapl-debug b/patches/dapl-debug
index 4507ab152a5d5bae47445a1055db3616061857f2..66b25fc3a0b5dd3149e81016aef78831e617a86e 100644 (file)
--- a/patches/dapl-debug
+++ b/patches/dapl-debug
@@ -1,5 +1,5 @@
 Bottom: 3f445e8cdd9f9563418a9aa82de3d988ae7df6c0
-Top:    65d5e34270b0db7ee5b29fc4663d5a8c3243df6d
+Top:    52141b7f2f2cd326ea88bd4e88e75f60cabb61b1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-02-01 16:12:47 -0800
 
@@ -116,4 +116,41 @@ index b8f7198..395c602 100644
 +dapl_log(DAPL_DBG_TYPE_ERR, "dapli_cma_event_cb device removed 0x%x\n", event->event);\r
                        dapl_evd_connection_callback(conn,\r
                                                     IB_CME_LOCAL_FAILURE,\r
-                                                    NULL, 0, conn->ep);
+                                                    NULL, 0, conn->ep);\r
+diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
+index cde309b..86efc44 100644
+--- a/trunk/ulp/librdmacm/src/cma.cpp
++++ b/trunk/ulp/librdmacm/src/cma.cpp
+@@ -904,6 +904,7 @@ static int ucma_process_conn_resp(struct cma_event *event)
+       HRESULT hr;\r
+ \r
+       if (FAILED(event->event.status)) {\r
++printf("ucma_process_conn_resp - failed 0x%x\n", event->event.status);\r
+               goto err;\r
+       }\r
+ \r
+@@ -915,6 +916,7 @@ static int ucma_process_conn_resp(struct cma_event *event)
+       hr = id->ep.connect->Accept(id->qp->conn_handle, &attr,\r
+                                                               &id->comp_entry.Overlap);\r
+       if (FAILED(hr) && hr != WV_IO_PENDING) {\r
++printf("ucma_process_conn_resp - accept failed 0x%x\n", hr);\r
+               id->comp_entry.Busy = 0;\r
+               event->event.status = hr;\r
+               goto err;\r
+@@ -938,6 +940,8 @@ static void ucma_process_establish(struct cma_event *event)
+               event->event.status = ucma_query_connect(&id_priv->id,\r
+                                                                                                &event->event.param.conn);\r
+       }\r
++else\r
++ printf("ucma_process_establish error 0x%x\n", event->event.status);\r
+ \r
+       if (SUCCEEDED(event->event.status)) {\r
+               event->event.event = RDMA_CM_EVENT_ESTABLISHED;\r
+@@ -947,6 +951,7 @@ static void ucma_process_establish(struct cma_event *event)
+               id_priv->id.comp_entry.Busy = 1;\r
+               id_priv->id.ep.connect->NotifyDisconnect(&id_priv->id.comp_entry.Overlap);\r
+       } else {\r
++printf("ucma_process_establish failure 0x%x\n", event->event.status);\r
+               event->event.event = RDMA_CM_EVENT_CONNECT_ERROR;\r
+               event->id_priv->state = cma_disconnected;\r
+       }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 0f6933b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,46 +0,0 @@
-Bottom: 65d5e34270b0db7ee5b29fc4663d5a8c3243df6d
-Top:    52141b7f2f2cd326ea88bd4e88e75f60cabb61b1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-02-02 15:46:05 -0800
-
-Refresh of dapl-debug
-
----
-
-diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
-index cde309b..86efc44 100644
---- a/trunk/ulp/librdmacm/src/cma.cpp
-+++ b/trunk/ulp/librdmacm/src/cma.cpp
-@@ -904,6 +904,7 @@ static int ucma_process_conn_resp(struct cma_event *event)
-       HRESULT hr;\r
- \r
-       if (FAILED(event->event.status)) {\r
-+printf("ucma_process_conn_resp - failed 0x%x\n", event->event.status);\r
-               goto err;\r
-       }\r
- \r
-@@ -915,6 +916,7 @@ static int ucma_process_conn_resp(struct cma_event *event)
-       hr = id->ep.connect->Accept(id->qp->conn_handle, &attr,\r
-                                                               &id->comp_entry.Overlap);\r
-       if (FAILED(hr) && hr != WV_IO_PENDING) {\r
-+printf("ucma_process_conn_resp - accept failed 0x%x\n", hr);\r
-               id->comp_entry.Busy = 0;\r
-               event->event.status = hr;\r
-               goto err;\r
-@@ -938,6 +940,8 @@ static void ucma_process_establish(struct cma_event *event)
-               event->event.status = ucma_query_connect(&id_priv->id,\r
-                                                                                                &event->event.param.conn);\r
-       }\r
-+else\r
-+ printf("ucma_process_establish error 0x%x\n", event->event.status);\r
- \r
-       if (SUCCEEDED(event->event.status)) {\r
-               event->event.event = RDMA_CM_EVENT_ESTABLISHED;\r
-@@ -947,6 +951,7 @@ static void ucma_process_establish(struct cma_event *event)
-               id_priv->id.comp_entry.Busy = 1;\r
-               id_priv->id.ep.connect->NotifyDisconnect(&id_priv->id.comp_entry.Overlap);\r
-       } else {\r
-+printf("ucma_process_establish failure 0x%x\n", event->event.status);\r
-               event->event.event = RDMA_CM_EVENT_CONNECT_ERROR;\r
-               event->id_priv->state = cma_disconnected;\r
-       }