From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 19 Jul 2012 17:14:25 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5eca3c7ac58d0d3a7a9801d0334af85ad5804488;p=~shefty%2Flibrdmacm.git

refresh
---

diff --git a/meta b/meta
index 20f060f1..20fdec1f 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: c86813ff0fbadbf9569f16cffb8cb9d71ede71a9
-Head: 0980c25d1fd655577daeca37ee5413d0157fb0ef
+Previous: ddbfb69667aec9843b3a689044e49df6b4a00747
+Head: 63a728f303f78348ad9727c46ac3e271197dace4
 Applied:
-  rm-ib-var: b485d53a6b7de6ca95faa59884ce0fba2e539c29
-  refresh-temp: 0980c25d1fd655577daeca37ee5413d0157fb0ef
+  rm-ib-var: 63a728f303f78348ad9727c46ac3e271197dace4
 Unapplied:
   cma-rm-pd: c44b3110a4c065b9209985f74341f48259247f37
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 3026aed0..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,39 +0,0 @@
-Bottom: 7ec243f3149e9a1ff1d5183f18e30d2458e354d6
-Top:    7683fa697371afc1116e378e4f1b6c848ead85aa
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-19 10:14:25 -0700
-
-Refresh of rm-ib-var
-
----
-
-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;
diff --git a/patches/rm-ib-var b/patches/rm-ib-var
index 813dc841..faaa27a9 100644
--- a/patches/rm-ib-var
+++ b/patches/rm-ib-var
@@ -1,5 +1,5 @@
 Bottom: 7ec243f3149e9a1ff1d5183f18e30d2458e354d6
-Top:    7ec243f3149e9a1ff1d5183f18e30d2458e354d6
+Top:    7683fa697371afc1116e378e4f1b6c848ead85aa
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-19 10:13:50 -0700
 
@@ -10,4 +10,33 @@ 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;