From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 10 May 2012 18:28:17 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3084bbacb95226eb7c15c15da621cf5491546f3a;p=~shefty%2Flibrdmacm.git

refresh
---

diff --git a/meta b/meta
index 82e8742b..9d4908dd 100644
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: a429f1c07dc686eddff944234891f91d2663c128
-Head: db6bfd46d4dcb251d47899cd34ee90190327f15e
+Previous: 9eebce406e9656dcec1cc29cb319c5590a1b7f5c
+Head: 0ac9e7124c0c6adf63350011f8eaf07b654d5f49
 Applied:
   rs-locking: ec6a8efe211b0dc98548443c2e0d67e2c355351f
-  reuseaddr: a0d5a8797de32a12cdc1e51aef332db25f8eef64
-  refresh-temp: db6bfd46d4dcb251d47899cd34ee90190327f15e
+  reuseaddr: 0ac9e7124c0c6adf63350011f8eaf07b654d5f49
 Unapplied:
   comp_locks: b89aab130b4619806557e11e6b9c10964f00743f
   preload: 5dfe7abc07064485c5100e04e5412279244c2bc3
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index eced3f65..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 3fcdf48082614bb29c44242534cfeecb47e07114
-Top:    ea75b8334003947a7f09ba5f0efcec267b5143c1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-10 11:28:17 -0700
-
-Refresh of reuseaddr
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 2ffde9b..de0ec3e 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1621,7 +1621,9 @@ int rsetsockopt(int socket, int level, int optname,
- 			ret = rdma_set_option(rs->cm_id, RDMA_OPTION_ID,
- 					      RDMA_OPTION_ID_REUSEADDR,
- 					      (void *) optval, optlen);
--			if (ret && errno == ENOSYS)
-+			if (ret && ((errno == ENOSYS) || ((rs->state != rs_init) &&
-+			    rs->cm_id->context &&
-+			    (rs->cm_id->verbs->device->transport_type == IBV_TRANSPORT_IB))))
- 				ret = 0;
- 			opt_on = *(int *) optval;
- 			break;
diff --git a/patches/reuseaddr b/patches/reuseaddr
index 2bfd0a73..71e6a85c 100644
--- a/patches/reuseaddr
+++ b/patches/reuseaddr
@@ -1,5 +1,5 @@
 Bottom: 3fcdf48082614bb29c44242534cfeecb47e07114
-Top:    3fcdf48082614bb29c44242534cfeecb47e07114
+Top:    ea75b8334003947a7f09ba5f0efcec267b5143c1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-10 11:17:32 -0700
 
@@ -17,4 +17,18 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 2ffde9b..de0ec3e 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -1621,7 +1621,9 @@ int rsetsockopt(int socket, int level, int optname,
+ 			ret = rdma_set_option(rs->cm_id, RDMA_OPTION_ID,
+ 					      RDMA_OPTION_ID_REUSEADDR,
+ 					      (void *) optval, optlen);
+-			if (ret && errno == ENOSYS)
++			if (ret && ((errno == ENOSYS) || ((rs->state != rs_init) &&
++			    rs->cm_id->context &&
++			    (rs->cm_id->verbs->device->transport_type == IBV_TRANSPORT_IB))))
+ 				ret = 0;
+ 			opt_on = *(int *) optval;
+ 			break;