Version: 1
-Previous: 42e63fec504d2c5a2dbaafa818fd1b97d0db80c8
-Head: c02c8dc13ad45d2d7feb5058eb4b28096987c01e
+Previous: 98092aed80d4b7c6e1b131d582196545a1d8bc4e
+Head: be06867bebb902083cc5161e0a07c48f226aa621
Applied:
sa_family: 85be179d2f63865dbf1f5adc1dc76c093c6b811e
- af_ib: bc29fc638eb134253a21057788b819de48a085bf
- refresh-temp: c02c8dc13ad45d2d7feb5058eb4b28096987c01e
+ af_ib: be06867bebb902083cc5161e0a07c48f226aa621
Unapplied:
dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a
dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
Bottom: a714bc4ff96a4b6832ac8f7cb9d7f0d37f8320e7
-Top: 162a1f68ee732043b0c08739b5bab499d00d568d
+Top: f785cd6baadc37d4b07525ba84ef1cb4eb08b31a
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2012-08-17 14:02:45 -0700
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..d538d92 100755
+index d96dbcd..7e7e8a7 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
+
+ if (ucma_ib_addr((*rai)->ai_src_addr, (*rai)->ai_src_len)) {
+ memcpy(&data->info.path.sgid,
-+ ((struct sockaddr_ib *) (*rai)->ai_src_addr)->sib_addr, 16);
++ &((struct sockaddr_ib *) (*rai)->ai_src_addr)->sib_addr, 16);
+ }
+ if (ucma_ib_addr((*rai)->ai_dst_addr, (*rai)->ai_dst_len)) {
+ memcpy(&data->info.path.dgid,
-+ ((struct sockaddr_ib *) (*rai)->ai_dst_addr)->sib_addr, 16);
++ &((struct sockaddr_ib *) (*rai)->ai_dst_addr)->sib_addr, 16);
}
+ data->type = ACM_EP_INFO_PATH;
+ data++;
+++ /dev/null
-Bottom: 162a1f68ee732043b0c08739b5bab499d00d568d
-Top: f785cd6baadc37d4b07525ba84ef1cb4eb08b31a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2012-08-24 16:34:58 -0700
-
-Refresh of af_ib
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index d538d92..7e7e8a7 100755
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -384,11 +384,11 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints)
-
- if (ucma_ib_addr((*rai)->ai_src_addr, (*rai)->ai_src_len)) {
- memcpy(&data->info.path.sgid,
-- ((struct sockaddr_ib *) (*rai)->ai_src_addr)->sib_addr, 16);
-+ &((struct sockaddr_ib *) (*rai)->ai_src_addr)->sib_addr, 16);
- }
- if (ucma_ib_addr((*rai)->ai_dst_addr, (*rai)->ai_dst_len)) {
- memcpy(&data->info.path.dgid,
-- ((struct sockaddr_ib *) (*rai)->ai_dst_addr)->sib_addr, 16);
-+ &((struct sockaddr_ib *) (*rai)->ai_dst_addr)->sib_addr, 16);
- }
- data->type = ACM_EP_INFO_PATH;
- data++;