refresh

diff --git a/meta b/meta
index a0eceab2121d57a58de213ce8a8537fbf0c36420..efe8b3707c2164fd4452d65a750b74635dde5e8c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 10e7d202e9b2d83fe69554a9ef698b2d0807f5d4
-Head: ec3fb85b5f0663e2e6c738032a04558c2b3dfbac
+Previous: e7693435f1524487deb12c02ecccb9fba2a15e35
+Head: 2c627e7f1eb3998a7587c9b1796a06be8e1013c7
 Applied:
   libibverbs-delete-channel: 1a2e03aa93780e8767fd6e0292edb623a39a56eb
   dapl-close: f6ef52ad6c76808fc8907155c51d9a9b34b13a40
   librdmacm-pdata: af838aef3d700e8ed7dba073f759c617ab3e47b7
-  dapl-pdata: b0044b0e91964b627ab1509c63d8d1df9eb4dd33
-  refresh-temp: ec3fb85b5f0663e2e6c738032a04558c2b3dfbac
+  dapl-pdata: 2c627e7f1eb3998a7587c9b1796a06be8e1013c7
 Unapplied:
   rm-build: c6f066675d61b6b6ad5b6271e8af655439f70dc6
   test-wv-print: e22c09acef52e5c119f80c0a646bcf9035094b80

diff --git a/patches/dapl-pdata b/patches/dapl-pdata
index ac1f1f770c25e5710754bf715695de182dcfbfe3..9c95348e8a24c98445e5426b81ff85d391b56fce 100644 (file)
--- a/patches/dapl-pdata
+++ b/patches/dapl-pdata
@@ -1,5 +1,5 @@
 Bottom: 6ef74d9f085bf61fd5210149cb3820201c01776a
-Top:    f75b5fb1f86246f3dc9ee2178962cd62e1657037
+Top:    1b540a9dccb53296ca688af747c3bf4a1da3af21
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-01-22 16:22:36 -0800
 
@@ -224,8 +224,22 @@ index 2304435..e5a7c3f 100644
      IN        const void *            context );
  
  /* dto verb callback */
+diff --git a/trunk/ulp/dapl2/dapl/common/dapl_ia_query.c b/trunk/ulp/dapl2/dapl/common/dapl_ia_query.c
+index 6fcc4a2..d530d72 100644
+--- a/trunk/ulp/dapl2/dapl/common/dapl_ia_query.c
++++ b/trunk/ulp/dapl2/dapl/common/dapl_ia_query.c
+@@ -150,8 +150,7 @@ dapl_ia_query(IN DAT_IA_HANDLE ia_handle,
+                *      to 0 unless IBHOSTS_NAMING is enabled.
+                */
+               provider_attr->max_private_data_size =
+-                  dapls_ib_private_data_size(NULL, DAPL_PDATA_CONN_REQ,
+-                                             ia_ptr->hca_ptr) -
++                  dapls_ib_private_data_size(ia_ptr->hca_ptr) -
+                   (sizeof(DAPL_PRIVATE) - DAPL_MAX_PRIVATE_DATA_SIZE);
+               provider_attr->supports_multipath = DAT_FALSE;
+               provider_attr->ep_creator = DAT_PSP_CREATES_EP_NEVER;
 diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
-index 149bcbf..591f92d 100644
+index 149bcbf..fac567a 100644
 --- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
 +++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
 @@ -216,6 +216,7 @@ dapli_ib_cm_dreq_cb (
@@ -324,6 +338,86 @@ index 149bcbf..591f92d 100644
      cm_rej.p_rej_pdata  = private_data;
      cm_rej.rej_length   = private_data_size;
  
+@@ -1723,78 +1724,11 @@ dapls_ib_cr_handoff (
+ }
+ #endif
+ 
+-/*
+- * dapls_ib_private_data_size
+- *
+- * Return the size of private data given a connection op type
+- *
+- * Input:
+- *    prd_ptr         private data pointer
+- *    conn_op         connection operation type
+- *    hca_ptr         hca pointer, needed for transport type
+- *
+- * If prd_ptr is NULL, this is a query for the max size supported by
+- * the provider, otherwise it is the actual size of the private data
+- * contained in prd_ptr.
+- *
+- * Infiniband has fixed size private data, so prd_ptr is ignored.
+- *
+- * Output:
+- *    None
+- *
+- * Returns:
+- *    length of private data
+- *
+- */
+ int
+ dapls_ib_private_data_size (
+-      IN      DAPL_PRIVATE            *prd_ptr,
+-      IN      DAPL_PDATA_OP           conn_op,
+       IN      DAPL_HCA                *hca_ptr)
+ {
+-    int  size;
+-
+-    UNUSED_PARAM( prd_ptr );
+-    UNUSED_PARAM( hca_ptr );
+-
+-    switch (conn_op)
+-    {
+-        case DAPL_PDATA_CONN_REQ:
+-      {
+-          size = IB_MAX_REQ_PDATA_SIZE;
+-          break;
+-      }
+-        case DAPL_PDATA_CONN_REP:
+-      {
+-          size = IB_MAX_REP_PDATA_SIZE;
+-          break;
+-      }
+-        case DAPL_PDATA_CONN_REJ:
+-      {
+-          size = IB_MAX_REJ_PDATA_SIZE;
+-          break;
+-      }
+-        case DAPL_PDATA_CONN_DREQ:
+-      {
+-          size = IB_MAX_DREQ_PDATA_SIZE;
+-          break;
+-      }
+-        case DAPL_PDATA_CONN_DREP:
+-      {
+-          size = IB_MAX_DREP_PDATA_SIZE;
+-          break;
+-      }
+-        default:
+-      {
+-          size = 0;
+-      }
+-    } /* end case */
+-
+-#if defined(DAPL_DBG) && 0
+-    dapl_dbg_log (DAPL_DBG_TYPE_CM, "%s: returns %d\n", __FUNCTION__, size );
+-#endif
+-
+-    return size;
++    return IB_MAX_REQ_PDATA_SIZE;
+ }
+ 
+ 
 diff --git a/trunk/ulp/dapl2/dapl/openib_cma/cm.c b/trunk/ulp/dapl2/dapl/openib_cma/cm.c
 index c52e716..e0e034b 100644
 --- a/trunk/ulp/dapl2/dapl/openib_cma/cm.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c73f1be..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,105 +0,0 @@
-Bottom: f75b5fb1f86246f3dc9ee2178962cd62e1657037
-Top:    1b540a9dccb53296ca688af747c3bf4a1da3af21
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-01-22 17:16:31 -0800
-
-Refresh of dapl-pdata
-
----
-
-diff --git a/trunk/ulp/dapl2/dapl/common/dapl_ia_query.c b/trunk/ulp/dapl2/dapl/common/dapl_ia_query.c
-index 6fcc4a2..d530d72 100644
---- a/trunk/ulp/dapl2/dapl/common/dapl_ia_query.c
-+++ b/trunk/ulp/dapl2/dapl/common/dapl_ia_query.c
-@@ -150,8 +150,7 @@ dapl_ia_query(IN DAT_IA_HANDLE ia_handle,
-                *      to 0 unless IBHOSTS_NAMING is enabled.
-                */
-               provider_attr->max_private_data_size =
--                  dapls_ib_private_data_size(NULL, DAPL_PDATA_CONN_REQ,
--                                             ia_ptr->hca_ptr) -
-+                  dapls_ib_private_data_size(ia_ptr->hca_ptr) -
-                   (sizeof(DAPL_PRIVATE) - DAPL_MAX_PRIVATE_DATA_SIZE);
-               provider_attr->supports_multipath = DAT_FALSE;
-               provider_attr->ep_creator = DAT_PSP_CREATES_EP_NEVER;
-diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
-index 591f92d..fac567a 100644
---- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
-+++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c
-@@ -1724,78 +1724,11 @@ dapls_ib_cr_handoff (
- }
- #endif
- 
--/*
-- * dapls_ib_private_data_size
-- *
-- * Return the size of private data given a connection op type
-- *
-- * Input:
-- *    prd_ptr         private data pointer
-- *    conn_op         connection operation type
-- *    hca_ptr         hca pointer, needed for transport type
-- *
-- * If prd_ptr is NULL, this is a query for the max size supported by
-- * the provider, otherwise it is the actual size of the private data
-- * contained in prd_ptr.
-- *
-- * Infiniband has fixed size private data, so prd_ptr is ignored.
-- *
-- * Output:
-- *    None
-- *
-- * Returns:
-- *    length of private data
-- *
-- */
- int
- dapls_ib_private_data_size (
--      IN      DAPL_PRIVATE            *prd_ptr,
--      IN      DAPL_PDATA_OP           conn_op,
-       IN      DAPL_HCA                *hca_ptr)
- {
--    int  size;
--
--    UNUSED_PARAM( prd_ptr );
--    UNUSED_PARAM( hca_ptr );
--
--    switch (conn_op)
--    {
--        case DAPL_PDATA_CONN_REQ:
--      {
--          size = IB_MAX_REQ_PDATA_SIZE;
--          break;
--      }
--        case DAPL_PDATA_CONN_REP:
--      {
--          size = IB_MAX_REP_PDATA_SIZE;
--          break;
--      }
--        case DAPL_PDATA_CONN_REJ:
--      {
--          size = IB_MAX_REJ_PDATA_SIZE;
--          break;
--      }
--        case DAPL_PDATA_CONN_DREQ:
--      {
--          size = IB_MAX_DREQ_PDATA_SIZE;
--          break;
--      }
--        case DAPL_PDATA_CONN_DREP:
--      {
--          size = IB_MAX_DREP_PDATA_SIZE;
--          break;
--      }
--        default:
--      {
--          size = 0;
--      }
--    } /* end case */
--
--#if defined(DAPL_DBG) && 0
--    dapl_dbg_log (DAPL_DBG_TYPE_CM, "%s: returns %d\n", __FUNCTION__, size );
--#endif
--
--    return size;
-+    return IB_MAX_REQ_PDATA_SIZE;
- }