refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..701e575
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,39 @@
+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,