refresh

diff --git a/meta b/meta
index c6a1683f1d85ade6ea4ddf051c938756b77ec9fc..5215fd0f978363ab93b072944b1e5aec07a20664 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 47bae33fd9a78b1ea6a9fb3be0ec7dcd08139aa2
-Head: aeb215d04e942b6877c2359ea54ab28cb42e5787
+Previous: 0be7aaa4a77c48a6947baf382fd7a2c3b7973b19
+Head: 1894e3c0f3e012cc1a77817f11677bdec221a20d
 Applied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa
@@ -10,8 +10,7 @@ Applied:
   opt-cp: 0c67e54602a5ce5524698f8aba7f543f356a865a
   gai: 720aaa185b9ce215b2d0678f103ccdf50fa7ffbf
   getreq: 0b8f86a7e557e3b9abf4c2586ae9e7e885462623
-  ep: cd06b1d11e30b36d43cf8c3211c2e50116631a08
-  refresh-temp: aeb215d04e942b6877c2359ea54ab28cb42e5787
+  ep: 1894e3c0f3e012cc1a77817f11677bdec221a20d
 Unapplied:
   cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755

diff --git a/patches/ep b/patches/ep
index 343e08b3aa8b3070ed453c99dd5d67a869e0997b..49a732578e5a2db5866f49c0d8be4d0c97c2ed06 100644 (file)
--- a/patches/ep
+++ b/patches/ep
@@ -1,5 +1,5 @@
 Bottom: a45cf3510a8be501cd8adbda6d59d519d5ea9468
-Top:    00f7ceb6e5b2ceb61a3fb4fbe942c7cfcad9529e
+Top:    b947cd8d23c0e7a918f2659a707c0e94f7caeb30
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-16 11:10:48 -0700
 
@@ -57,7 +57,7 @@ index 66932ca..6307eb5 100644
   * @id: The communication identifier to destroy.\r
   * Description:\r
 diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
-index 77cceb0..cb2f20c 100644
+index 77cceb0..6e1f93a 100644
 --- a/trunk/ulp/librdmacm/src/cma.cpp
 +++ b/trunk/ulp/librdmacm/src/cma.cpp
 @@ -74,6 +74,8 @@ struct cma_id_private
@@ -69,34 +69,47 @@ index 77cceb0..cb2f20c 100644
        uint8_t                                         initiator_depth;\r
        uint8_t                                         responder_resources;\r
  };\r
-@@ -1343,6 +1345,84 @@ int rdma_migrate_id(struct rdma_cm_id *id, struct rdma_event_channel *channel)
+@@ -948,6 +950,12 @@ int rdma_get_request(struct rdma_cm_id *listen, struct rdma_cm_id **id)
+               goto err;\r
+       }\r
+ \r
++      if (id_priv->qp_init_attr) {\r
++              ret = rdma_create_qp(event->id, id_priv->pd, id_priv->qp_init_attr);\r
++              if (ret)\r
++                      goto err;\r
++      }\r
++\r
+       *id = event->id;\r
+       (*id)->event = event;\r
+       return 0;\r
+@@ -1343,6 +1351,84 @@ int rdma_migrate_id(struct rdma_cm_id *id, struct rdma_event_channel *channel)
        return 0;\r
  }\r
  \r
-+static int ucma_passive_ep(struct rdma_cm_id *id, struct rdma_addrinfo *res,
-+                                                 struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr)
-+{
-+      struct cma_id_private *id_priv;
-+      int ret;
-+
-+      ret = rdma_bind_addr(id, res->ai_src_addr);
-+      if (ret)
-+              return ret;
-+
-+      id_priv = CONTAINING_RECORD(id, struct cma_id_private, id);
-+      id_priv->pd = pd;
-+
-+      if (qp_init_attr) {
-+              id_priv->qp_init_attr = new struct ibv_qp_init_attr;
-+              if (!id_priv->qp_init_attr)
-+                      return rdma_seterrno(ENOMEM);
-+
-+              *id_priv->qp_init_attr = *qp_init_attr;
-+              id_priv->qp_init_attr->qp_type = (enum ibv_qp_type) res->ai_qp_type;
-+      }
-+
-+      return 0;
-+}
++static int ucma_passive_ep(struct rdma_cm_id *id, struct rdma_addrinfo *res,\r
++                                                 struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr)\r
++{\r
++      struct cma_id_private *id_priv;\r
++      int ret;\r
++\r
++      ret = rdma_bind_addr(id, res->ai_src_addr);\r
++      if (ret)\r
++              return ret;\r
++\r
++      id_priv = CONTAINING_RECORD(id, struct cma_id_private, id);\r
++      id_priv->pd = pd;\r
++\r
++      if (qp_init_attr) {\r
++              id_priv->qp_init_attr = new struct ibv_qp_init_attr;\r
++              if (!id_priv->qp_init_attr)\r
++                      return rdma_seterrno(ENOMEM);\r
++\r
++              *id_priv->qp_init_attr = *qp_init_attr;\r
++              id_priv->qp_init_attr->qp_type = (enum ibv_qp_type) res->ai_qp_type;\r
++      }\r
++\r
++      return 0;\r
++}\r
 +\r
 +int rdma_create_ep(struct rdma_cm_id **id, struct rdma_addrinfo *res,\r
 +                                 struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr)\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 24d1d4c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,81 +0,0 @@
-Bottom: 00f7ceb6e5b2ceb61a3fb4fbe942c7cfcad9529e
-Top:    b947cd8d23c0e7a918f2659a707c0e94f7caeb30
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-16 11:59:12 -0700
-
-Refresh of ep
-
----
-
-diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
-index cb2f20c..6e1f93a 100644
---- a/trunk/ulp/librdmacm/src/cma.cpp
-+++ b/trunk/ulp/librdmacm/src/cma.cpp
-@@ -950,6 +950,12 @@ int rdma_get_request(struct rdma_cm_id *listen, struct rdma_cm_id **id)
-               goto err;\r
-       }\r
- \r
-+      if (id_priv->qp_init_attr) {\r
-+              ret = rdma_create_qp(event->id, id_priv->pd, id_priv->qp_init_attr);\r
-+              if (ret)\r
-+                      goto err;\r
-+      }\r
-+\r
-       *id = event->id;\r
-       (*id)->event = event;\r
-       return 0;\r
-@@ -1345,30 +1351,30 @@ int rdma_migrate_id(struct rdma_cm_id *id, struct rdma_event_channel *channel)
-       return 0;\r
- }\r
- \r
--static int ucma_passive_ep(struct rdma_cm_id *id, struct rdma_addrinfo *res,
--                                                 struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr)
--{
--      struct cma_id_private *id_priv;
--      int ret;
--
--      ret = rdma_bind_addr(id, res->ai_src_addr);
--      if (ret)
--              return ret;
--
--      id_priv = CONTAINING_RECORD(id, struct cma_id_private, id);
--      id_priv->pd = pd;
--
--      if (qp_init_attr) {
--              id_priv->qp_init_attr = new struct ibv_qp_init_attr;
--              if (!id_priv->qp_init_attr)
--                      return rdma_seterrno(ENOMEM);
--
--              *id_priv->qp_init_attr = *qp_init_attr;
--              id_priv->qp_init_attr->qp_type = (enum ibv_qp_type) res->ai_qp_type;
--      }
--
--      return 0;
--}
-+static int ucma_passive_ep(struct rdma_cm_id *id, struct rdma_addrinfo *res,\r
-+                                                 struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr)\r
-+{\r
-+      struct cma_id_private *id_priv;\r
-+      int ret;\r
-+\r
-+      ret = rdma_bind_addr(id, res->ai_src_addr);\r
-+      if (ret)\r
-+              return ret;\r
-+\r
-+      id_priv = CONTAINING_RECORD(id, struct cma_id_private, id);\r
-+      id_priv->pd = pd;\r
-+\r
-+      if (qp_init_attr) {\r
-+              id_priv->qp_init_attr = new struct ibv_qp_init_attr;\r
-+              if (!id_priv->qp_init_attr)\r
-+                      return rdma_seterrno(ENOMEM);\r
-+\r
-+              *id_priv->qp_init_attr = *qp_init_attr;\r
-+              id_priv->qp_init_attr->qp_type = (enum ibv_qp_type) res->ai_qp_type;\r
-+      }\r
-+\r
-+      return 0;\r
-+}\r
- \r
- int rdma_create_ep(struct rdma_cm_id **id, struct rdma_addrinfo *res,\r
-                                  struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr)