commit

diff --git a/meta b/meta
index d5395f152c317f96ba7239e4f312ada815f8da32..e1bc3a29f2523111d5ddb4c413934bdf2e6efd27 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 84ee1e64d13e8152c997f8a50de8207b18aef65a
+Previous: f0b66bdf0d5c2390d58b3724ceceda651b9dbe41
 Head: 6a2efde034c2ac78ea8b5429361d95d75fc2731a
 Applied:
-  rm-ib-var: 63a728f303f78348ad9727c46ac3e271197dace4
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 7856c0c353736cee5399eb2f706a6ac2913cc368
   fork: 1768d762d8a2100e5250234ddf080b722a5e582f

diff --git a/patches/rm-ib-var b/patches/rm-ib-var
deleted file mode 100644 (file)
index faaa27a..0000000
--- a/patches/rm-ib-var
+++ /dev/null
@@ -1,42 +0,0 @@
-Bottom: 7ec243f3149e9a1ff1d5183f18e30d2458e354d6
-Top:    7683fa697371afc1116e378e4f1b6c848ead85aa
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-19 10:13:50 -0700
-
-librdmacm: Remove unused 'ib' variable from ucma_init
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index 86dd787..bad8bce 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -206,7 +206,7 @@ int ucma_init(void)
-       struct ibv_device **dev_list = NULL;
-       struct cma_device *cma_dev;
-       struct ibv_device_attr attr;
--      int i, ret, dev_cnt, ib;
-+      int i, ret, dev_cnt;
- 
-       /* Quick check without lock to see if we're already initialized */
-       if (cma_dev_cnt)
-@@ -241,7 +241,7 @@ int ucma_init(void)
-               goto err2;
-       }
- 
--      for (i = 0, ib = 0; dev_list[i];) {
-+      for (i = 0; dev_list[i];) {
-               cma_dev = &cma_dev_array[i];
- 
-               cma_dev->guid = ibv_get_device_guid(dev_list[i]);
-@@ -271,7 +271,6 @@ int ucma_init(void)
-               cma_dev->max_qpsize = attr.max_qp_wr;
-               cma_dev->max_initiator_depth = (uint8_t) attr.max_qp_init_rd_atom;
-               cma_dev->max_responder_resources = (uint8_t) attr.max_qp_rd_atom;
--              ib += (cma_dev->verbs->device->transport_type == IBV_TRANSPORT_IB);
-       }
- 
-       cma_dev_cnt = dev_cnt;