refresh

diff --git a/meta b/meta
index 78ad704c7b8f3ef89b04c7f077be31b24c6185ac..3c081dd5e87eeaa5f6dac6e842235ce88d056221 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: f930340c25c2a68ce2800269b41caf702a96b021
-Head: 9b4d454f892f018e5c67c80e0cde447c3beb4dcb
+Previous: e25eea964778dc76158d38094834e0af87147ab0
+Head: 418b54e6098436f69bcb7f054da2cb3addc6d5ac
 Applied:
   ibal-disc: 0a94c7ee2fd0d807117d31953f949935320f12da
-  dapl-win: 95db284dce9d30103dcf40340c8e49cae418db26
-  refresh-temp: 9b4d454f892f018e5c67c80e0cde447c3beb4dcb
+  dapl-win: 418b54e6098436f69bcb7f054da2cb3addc6d5ac
 Unapplied:
   dapl-update: 2df1438b75e945d48a63fbda74079a77978f315d
   cma-priv-data: 83299e9a772068a302a4d39ff4e7ba45d4bd26b5

diff --git a/patches/dapl-win b/patches/dapl-win
index d4ad9fb2d82d5813734ebd27f69555280c1103af..4cf02a0379fe03bfc065477c7c3344130dd497aa 100644 (file)
--- a/patches/dapl-win
+++ b/patches/dapl-win
@@ -1,5 +1,5 @@
 Bottom: 6e1690af48f30c8d7839fc5dbf6e9f6c7bd92ede
-Top:    6e1690af48f30c8d7839fc5dbf6e9f6c7bd92ede
+Top:    271a570ea67afa103368fd3623b66ef272f81a13
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-10-04 11:36:27 -0700
 
@@ -10,4 +10,33 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
+index 37e158b..76abb94 100644
+--- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
++++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
+@@ -259,10 +259,9 @@ dapli_ib_cm_dreq_cb (
+     dapl_os_assert(cm_ptr->ib_cm.h_qp == p_cm_dreq_rec->h_cm_dreq.h_qp);
+ 
+     dapl_dbg_log (DAPL_DBG_TYPE_CM, 
+-                  "--> %s() EP %p, %s sent_discreq %s\n",
++                  "--> %s() EP %p, %s\n",
+                   __FUNCTION__,ep_ptr,
+-                  dapl_get_ep_state_str(ep_ptr->param.ep_state),
+-                  (ep_ptr->sent_discreq == DAT_TRUE ? "TRUE":"FALSE"));
++                  dapl_get_ep_state_str(ep_ptr->param.ep_state));
+ 
+     dapl_os_lock (&ep_ptr->header.lock);
+     if ( ep_ptr->param.ep_state == DAT_EP_STATE_DISCONNECTED )
+diff --git a/trunk/ulp/dapl2/dapl/openib_cma/cm.c b/trunk/ulp/dapl2/dapl/openib_cma/cm.c
+index 9338d55..c941f74 100644
+--- a/trunk/ulp/dapl2/dapl/openib_cma/cm.c
++++ b/trunk/ulp/dapl2/dapl/openib_cma/cm.c
+@@ -105,7 +105,7 @@ static void dapli_route_resolve(struct dapl_cm_id *conn)
+       int ret;
+ #ifdef DAPL_DBG
+       struct rdma_addr *ipaddr = &conn->cm_id->route.addr;
+-      struct ib_addr *ibaddr = &conn->cm_id->route.addr.addr.ibaddr;
++      struct rdma_ib_addr *ibaddr = &conn->cm_id->route.addr.addr.ibaddr;
+ #endif
+ 
+       dapl_dbg_log(DAPL_DBG_TYPE_CM,

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 701e575..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,39 +0,0 @@
-Bottom: 6e1690af48f30c8d7839fc5dbf6e9f6c7bd92ede
-Top:    271a570ea67afa103368fd3623b66ef272f81a13
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-10-04 11:37:15 -0700
-
-Refresh of dapl-win
-
----
-
-diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
-index 37e158b..76abb94 100644
---- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
-+++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
-@@ -259,10 +259,9 @@ dapli_ib_cm_dreq_cb (
-     dapl_os_assert(cm_ptr->ib_cm.h_qp == p_cm_dreq_rec->h_cm_dreq.h_qp);
- 
-     dapl_dbg_log (DAPL_DBG_TYPE_CM, 
--                  "--> %s() EP %p, %s sent_discreq %s\n",
-+                  "--> %s() EP %p, %s\n",
-                   __FUNCTION__,ep_ptr,
--                  dapl_get_ep_state_str(ep_ptr->param.ep_state),
--                  (ep_ptr->sent_discreq == DAT_TRUE ? "TRUE":"FALSE"));
-+                  dapl_get_ep_state_str(ep_ptr->param.ep_state));
- 
-     dapl_os_lock (&ep_ptr->header.lock);
-     if ( ep_ptr->param.ep_state == DAT_EP_STATE_DISCONNECTED )
-diff --git a/trunk/ulp/dapl2/dapl/openib_cma/cm.c b/trunk/ulp/dapl2/dapl/openib_cma/cm.c
-index 9338d55..c941f74 100644
---- a/trunk/ulp/dapl2/dapl/openib_cma/cm.c
-+++ b/trunk/ulp/dapl2/dapl/openib_cma/cm.c
-@@ -105,7 +105,7 @@ static void dapli_route_resolve(struct dapl_cm_id *conn)
-       int ret;
- #ifdef DAPL_DBG
-       struct rdma_addr *ipaddr = &conn->cm_id->route.addr;
--      struct ib_addr *ibaddr = &conn->cm_id->route.addr.addr.ibaddr;
-+      struct rdma_ib_addr *ibaddr = &conn->cm_id->route.addr.addr.ibaddr;
- #endif
- 
-       dapl_dbg_log(DAPL_DBG_TYPE_CM,