refresh (create temporary patch)

diff --git a/meta b/meta
index 619023cb7c2d00ddfa464eb34cc0ffedecb3b520..9b403cffd73fa134f5742378a532540b490a6d1b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: c1a95dfca80059343bc28d4de24697c764a41910
-Head: ecf1598c5ad76ba4eb5e13bf7a1c0dc457f054fc
+Previous: ee392512a0d9e7d2f5beee4b18d0b4a14d219301
+Head: ecfb03200059229f95ff55835d8d92ec9cd748ba
 Applied:
   libibverbs-delete-channel: 1a2e03aa93780e8767fd6e0292edb623a39a56eb
   dapl-close: f6ef52ad6c76808fc8907155c51d9a9b34b13a40
   librdmacm-pdata: af838aef3d700e8ed7dba073f759c617ab3e47b7
   dapl-pdata2: ecf1598c5ad76ba4eb5e13bf7a1c0dc457f054fc
+  refresh-temp: ecfb03200059229f95ff55835d8d92ec9cd748ba
 Unapplied:
   dapl-pdata: 2c627e7f1eb3998a7587c9b1796a06be8e1013c7
   rm-build: c6f066675d61b6b6ad5b6271e8af655439f70dc6

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..3163080
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,50 @@
+Bottom: 6ef74d9f085bf61fd5210149cb3820201c01776a
+Top:    3f957c908fe3d970e73ec937d5ffc55552925584
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-01-22 22:34:44 -0800
+
+Refresh of dapl-pdata2
+
+---
+
+diff --git a/trunk/ulp/dapl2/dapl/openib_cma/cm.c b/trunk/ulp/dapl2/dapl/openib_cma/cm.c
+index c52e716..0212c0e 100644
+--- a/trunk/ulp/dapl2/dapl/openib_cma/cm.c
++++ b/trunk/ulp/dapl2/dapl/openib_cma/cm.c
+@@ -1023,35 +1023,7 @@ dapls_ib_cm_remote_addr(IN DAT_HANDLE dat_handle, OUT DAT_SOCK_ADDR6 * raddr)
+ int dapls_ib_private_data_size(IN DAPL_PRIVATE * prd_ptr,
+                              IN DAPL_PDATA_OP conn_op, IN DAPL_HCA * hca_ptr)
+ {
+-      int size;
+-
+-      if (hca_ptr->ib_hca_handle->device->transport_type
+-          == IBV_TRANSPORT_IWARP)
+-              return (IWARP_MAX_PDATA_SIZE - sizeof(struct dapl_pdata_hdr));
+-
+-      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 - sizeof(struct dapl_pdata_hdr);
+-              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 */
+-
+-      return size;
++      return RDMA_MAX_PRIVATE_DATA;
+ }
+ 
+ /*