refresh

diff --git a/meta b/meta
index b46412e544e53aca5b8b5f375a0a649cf98c30a5..71ec2bd35cf3e9cab906ff5e5f46f26d8182aa6d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 8063edee361d7778640c5656d357955dee3e7e4b
-Head: 28d0e8f436a722de29d61ba073b82461fcf66349
+Previous: cd49cfb5a912a44fbc12d235e2200edb2af95412
+Head: 0dd5de47b21e3a7274ec258f969cfb366f7b5e46
 Applied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa
   opt-pd: 408a5b12070039ac95d02f07c04a07d681859a89
   opt-cq: eb08384598a3829b40cc525aa2871e4e96817507
-  max-rdma: cafeeb1da77fb11cb704c50267546f8854c1c5c9
-  refresh-temp: 28d0e8f436a722de29d61ba073b82461fcf66349
+  max-rdma: 0dd5de47b21e3a7274ec258f969cfb366f7b5e46
 Unapplied:
   cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755

diff --git a/patches/max-rdma b/patches/max-rdma
index c81b376b68cb746a94352da352df105d05eaf000..7df26d40365a3d8bc1709228676e7cbb39b372fa 100644 (file)
--- a/patches/max-rdma
+++ b/patches/max-rdma
@@ -1,5 +1,5 @@
 Bottom: 8cf40079eee667ce77d40e89ceda72843734dba8
-Top:    a112d61591167592063eaca83d29cb8d0f18d350
+Top:    60601e6b52245f274a742dc5d0aa86eef1042693
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-13 15:35:07 -0700
 
@@ -25,7 +25,7 @@ index 16f7f21..294a75b 100644
  {\r
        const void *private_data;\r
 diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
-index 0d6e6f5..d8ba0be 100644
+index 0d6e6f5..05c672d 100644
 --- a/trunk/ulp/librdmacm/src/cma.cpp
 +++ b/trunk/ulp/librdmacm/src/cma.cpp
 @@ -74,6 +74,8 @@ struct cma_id_private
@@ -37,7 +37,7 @@ index 0d6e6f5..d8ba0be 100644
  };\r
  \r
  struct cma_device\r
-@@ -737,15 +739,19 @@ void rdma_destroy_qp(struct rdma_cm_id *id)
+@@ -737,15 +739,20 @@ void rdma_destroy_qp(struct rdma_cm_id *id)
  }\r
  \r
  static int ucma_valid_param(struct cma_id_private *id_priv,\r
@@ -54,6 +54,7 @@ index 0d6e6f5..d8ba0be 100644
 +      if ((param->responder_resources != RDMA_MAX_RESP_RES) &&\r
 +              (param->responder_resources > id_priv->cma_dev->max_responder_resources)) {\r
 +              return rdma_seterrno(EINVAL);\r
++      }\r
 +              \r
 +      if ((param->initiator_depth != RDMA_MAX_INIT_DEPTH) &&\r
 +              (param->initiator_depth > id_priv->cma_dev->max_initiator_depth)) {\r
@@ -61,14 +62,14 @@ index 0d6e6f5..d8ba0be 100644
        }\r
  \r
        return 0;\r
-@@ -765,9 +771,14 @@ int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
+@@ -765,9 +772,14 @@ int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
                return ret;\r
        }\r
  \r
 +      id_priv->responder_resources = min(conn_param->responder_resources,\r
-+                                                                         id_priv->cma_dev->responder_resources);\r
++                                                                         id_priv->cma_dev->max_responder_resources);\r
 +      id_priv->initiator_depth = min(conn_param->initiator_depth,\r
-+                                                                 id_priv->cma_dev->initiator_depth);\r
++                                                                 id_priv->cma_dev->max_initiator_depth);\r
 +\r
        RtlZeroMemory(&attr, sizeof attr);\r
 -      attr.ResponderResources = conn_param->responder_resources;\r
@@ -78,7 +79,7 @@ index 0d6e6f5..d8ba0be 100644
        attr.RetryCount = conn_param->retry_count;\r
        attr.RnrRetryCount = conn_param->rnr_retry_count;\r
        if ((attr.DataLength = conn_param->private_data_len)) {\r
-@@ -892,9 +903,22 @@ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
+@@ -892,9 +904,22 @@ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
                return ret;\r
        }\r
  \r
@@ -103,7 +104,7 @@ index 0d6e6f5..d8ba0be 100644
        attr.RetryCount = conn_param->retry_count;\r
        attr.RnrRetryCount = conn_param->rnr_retry_count;\r
        if ((attr.DataLength = conn_param->private_data_len)) {\r
-@@ -1004,6 +1028,8 @@ static int ucma_process_conn_req(struct cma_event *event)
+@@ -1004,6 +1029,8 @@ static int ucma_process_conn_req(struct cma_event *event)
        event->event.event = RDMA_CM_EVENT_CONNECT_REQUEST;\r
        id_priv->state = cma_passive_connect;\r
        event->event.listen_id = &listen->id;\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 6ff8fb8..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,33 +0,0 @@
-Bottom: a112d61591167592063eaca83d29cb8d0f18d350
-Top:    60601e6b52245f274a742dc5d0aa86eef1042693
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-13 17:42:47 -0700
-
-Refresh of max-rdma
-
----
-
-diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
-index d8ba0be..05c672d 100644
---- a/trunk/ulp/librdmacm/src/cma.cpp
-+++ b/trunk/ulp/librdmacm/src/cma.cpp
-@@ -748,6 +748,7 @@ static int ucma_valid_param(struct cma_id_private *id_priv,
-       if ((param->responder_resources != RDMA_MAX_RESP_RES) &&\r
-               (param->responder_resources > id_priv->cma_dev->max_responder_resources)) {\r
-               return rdma_seterrno(EINVAL);\r
-+      }\r
-               \r
-       if ((param->initiator_depth != RDMA_MAX_INIT_DEPTH) &&\r
-               (param->initiator_depth > id_priv->cma_dev->max_initiator_depth)) {\r
-@@ -772,9 +773,9 @@ int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
-       }\r
- \r
-       id_priv->responder_resources = min(conn_param->responder_resources,\r
--                                                                         id_priv->cma_dev->responder_resources);\r
-+                                                                         id_priv->cma_dev->max_responder_resources);\r
-       id_priv->initiator_depth = min(conn_param->initiator_depth,\r
--                                                                 id_priv->cma_dev->initiator_depth);\r
-+                                                                 id_priv->cma_dev->max_initiator_depth);\r
- \r
-       RtlZeroMemory(&attr, sizeof attr);\r
-       attr.ResponderResources = id_priv->responder_resources;