refresh

diff --git a/meta b/meta
index a1a25492e55185550f5fb861655d4a184d0fcb36..1610a0a75ecb7f0276715771f7cde65419baaa59 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: f0f37a9f1fd922a739dd05db701a77e48bf8fc01
-Head: af9c8db79cf2ffe121f437d3f3569947749f4b23
+Previous: 959282175652d326d8bad899afb49ae0b75e7064
+Head: d6ca81dc1b7923005309b04c3bb684da0361cbc9
 Applied:
   sa_family: 85be179d2f63865dbf1f5adc1dc76c093c6b811e
-  af_ib: be06867bebb902083cc5161e0a07c48f226aa621
-  refresh-temp: af9c8db79cf2ffe121f437d3f3569947749f4b23
+  af_ib: d6ca81dc1b7923005309b04c3bb684da0361cbc9
 Unapplied:
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/af_ib b/patches/af_ib
index 68ee0167636d457e101701a09845bbb07928bd79..96d860cd093bf4db308d9ccc25b5981aa598b523 100644 (file)
--- a/patches/af_ib
+++ b/patches/af_ib
@@ -1,5 +1,5 @@
 Bottom: a714bc4ff96a4b6832ac8f7cb9d7f0d37f8320e7
-Top:    f785cd6baadc37d4b07525ba84ef1cb4eb08b31a
+Top:    887d55d9c4229530cb6672292eccba87095a9e52
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-17 14:02:45 -0700
 
@@ -45,7 +45,7 @@ index 1487f8f..f3c8921 100755
  static inline struct sockaddr *rdma_get_local_addr(struct rdma_cm_id *id)
  {
 diff --git a/src/acm.c b/src/acm.c
-index d96dbcd..7e7e8a7 100755
+index d96dbcd..92411fa 100755
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -324,6 +324,17 @@ static void ucma_copy_rai_addr(struct acm_ep_addr_data *data, struct sockaddr *a
@@ -119,6 +119,15 @@ index d96dbcd..7e7e8a7 100755
        }
  
        pthread_mutex_lock(&acm_lock);
+@@ -389,7 +410,7 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints)
+       ucma_ib_save_resp(*rai, &msg);
+ 
+       if (af_ib_support && !((*rai)->ai_flags & RAI_ROUTEONLY) &&
+-          (*rai)->ai_route_len)
++          (*rai)->ai_route_len && ((*rai)->ai_family != AF_IB))
+               ucma_resolve_af_ib(rai);
+ }
+ 
 diff --git a/src/cma.c b/src/cma.c
 index 5280620..2994655 100755
 --- a/src/cma.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index eaa4abc..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: f785cd6baadc37d4b07525ba84ef1cb4eb08b31a
-Top:    887d55d9c4229530cb6672292eccba87095a9e52
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-24 16:42:38 -0700
-
-Refresh of af_ib
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 7e7e8a7..92411fa 100755
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -410,7 +410,7 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints)
-       ucma_ib_save_resp(*rai, &msg);
- 
-       if (af_ib_support && !((*rai)->ai_flags & RAI_ROUTEONLY) &&
--          (*rai)->ai_route_len)
-+          (*rai)->ai_route_len && ((*rai)->ai_family != AF_IB))
-               ucma_resolve_af_ib(rai);
- }