refresh (create temporary patch)

diff --git a/meta b/meta
index 120c1bc265a13b5ab2911c7c0bb93ec4166e8c30..3539764d0a8b23c2ce5ce048211417605c2c9238 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 0bd17d50183cd22e1286aac39d961df9040c3431
-Head: 0b1809eeba8042df48fa48dfc66072e3b96f4caf
+Previous: a4ae07c1d7bca19194dd063115b08de9df0a5b13
+Head: c2797847598f5ccd2b7501fa85700564469385ad
 Applied:
   dapl-win: bfc5e1442631c70deb47f6c429aff6a64dcdfcb4
   create_ep: 0b1809eeba8042df48fa48dfc66072e3b96f4caf
+  refresh-temp: c2797847598f5ccd2b7501fa85700564469385ad
 Unapplied:
   ibal-disc: 0a94c7ee2fd0d807117d31953f949935320f12da
   dapl-update: 2df1438b75e945d48a63fbda74079a77978f315d

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..915d4ba
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,30 @@
+Bottom: 271a570ea67afa103368fd3623b66ef272f81a13
+Top:    1afe2b16ebd70fbedc09e688a79b237f9e7670a2
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-10-05 11:30:58 -0700
+
+Refresh of create_ep
+
+---
+
+diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
+index 215bdf6..841fbf6 100644
+--- a/trunk/ulp/librdmacm/src/cma.cpp
++++ b/trunk/ulp/librdmacm/src/cma.cpp
+@@ -1407,10 +1407,12 @@ int rdma_create_ep(struct rdma_cm_id **id, struct rdma_addrinfo *res,
+       if (ret)\r
+               goto err;\r
+ \r
+-      qp_init_attr->qp_type = (enum ibv_qp_type) res->ai_qp_type;\r
+-      ret = rdma_create_qp(cm_id, pd, qp_init_attr);\r
+-      if (ret)\r
+-              goto err;\r
++      if (qp_init_attr) {\r
++              qp_init_attr->qp_type = (enum ibv_qp_type) res->ai_qp_type;\r
++              ret = rdma_create_qp(cm_id, pd, qp_init_attr);\r
++              if (ret)\r
++                      goto err;\r
++      }\r
+ \r
+ out:\r
+       *id = cm_id;