From 96eebb7ca8fdf3aade371d39fdcc1471028f2ffd Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 28 Aug 2012 17:40:51 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 40 ---------------------------------------- patches/ren-copy-rai | 34 ++++++++++++++++++++++++++++++++-- 3 files changed, 35 insertions(+), 46 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index d895adcf..a483ae11 100644 --- a/meta +++ b/meta @@ -1,11 +1,10 @@ Version: 1 -Previous: 99bf88b1972ee46b831329438f3006e61accfabc -Head: fd8072f564f56fd96c03d532409948afcbd5c5f4 +Previous: 72971274849c6612be3521f8c515164eb6e6e8eb +Head: 556660962f0444989820137f12fe66486f9375e7 Applied: sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1 af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9 - ren-copy-rai: 5a8ff5306a0a35fb405bb044b322ae53d0c53858 - refresh-temp: fd8072f564f56fd96c03d532409948afcbd5c5f4 + ren-copy-rai: 556660962f0444989820137f12fe66486f9375e7 Unapplied: addrinfo-af-ib: fe7c9af1453a9ae9b4b8835fb5cba91e9fbe20bf dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 0d46f5a5..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,40 +0,0 @@ -Bottom: 2e0a7d3ef44614a3f6760f3dad7fff7ae67386fc -Top: 4e01eb8a1c0681cd7bcca9c1bf3502036b929d4b -Author: Sean Hefty -Date: 2012-08-28 17:40:51 -0700 - -Refresh of ren-copy-rai - ---- - -diff --git a/src/acm.c b/src/acm.c -index 92411fa..95eee73 100755 ---- a/src/acm.c -+++ b/src/acm.c -@@ -313,7 +313,7 @@ static void ucma_ib_save_resp(struct rdma_addrinfo *rai, cma_acm_msg_t *msg) - } - } - --static void ucma_copy_rai_addr(struct acm_ep_addr_data *data, struct sockaddr *addr) -+static void ucma_set_ep_addr(struct acm_ep_addr_data *data, struct sockaddr *addr) - { - if (addr->sa_family == AF_INET) { - data->type = ACM_EP_INFO_ADDRESS_IP; -@@ -353,7 +353,7 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints) - data = &msg.resolve_data[0]; - if (ucma_inet_addr((*rai)->ai_src_addr, (*rai)->ai_src_len)) { - data->flags = ACM_EP_FLAG_SOURCE; -- ucma_copy_rai_addr(data, (*rai)->ai_src_addr); -+ ucma_set_ep_addr(data, (*rai)->ai_src_addr); - data++; - msg.hdr.length += ACM_MSG_EP_LENGTH; - } -@@ -362,7 +362,7 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints) - data->flags = ACM_EP_FLAG_DEST; - if ((*rai)->ai_flags & (RAI_NUMERICHOST | RAI_NOROUTE)) - data->flags |= ACM_FLAGS_NODELAY; -- ucma_copy_rai_addr(data, (*rai)->ai_dst_addr); -+ ucma_set_ep_addr(data, (*rai)->ai_dst_addr); - data++; - msg.hdr.length += ACM_MSG_EP_LENGTH; - } diff --git a/patches/ren-copy-rai b/patches/ren-copy-rai index c985eaf0..634a3970 100644 --- a/patches/ren-copy-rai +++ b/patches/ren-copy-rai @@ -1,5 +1,5 @@ Bottom: 2e0a7d3ef44614a3f6760f3dad7fff7ae67386fc -Top: 2e0a7d3ef44614a3f6760f3dad7fff7ae67386fc +Top: 4e01eb8a1c0681cd7bcca9c1bf3502036b929d4b Author: Sean Hefty Date: 2012-08-28 17:37:30 -0700 @@ -12,4 +12,34 @@ Signed-off-by: Sean Hefty --- - +diff --git a/src/acm.c b/src/acm.c +index 92411fa..95eee73 100755 +--- a/src/acm.c ++++ b/src/acm.c +@@ -313,7 +313,7 @@ static void ucma_ib_save_resp(struct rdma_addrinfo *rai, cma_acm_msg_t *msg) + } + } + +-static void ucma_copy_rai_addr(struct acm_ep_addr_data *data, struct sockaddr *addr) ++static void ucma_set_ep_addr(struct acm_ep_addr_data *data, struct sockaddr *addr) + { + if (addr->sa_family == AF_INET) { + data->type = ACM_EP_INFO_ADDRESS_IP; +@@ -353,7 +353,7 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints) + data = &msg.resolve_data[0]; + if (ucma_inet_addr((*rai)->ai_src_addr, (*rai)->ai_src_len)) { + data->flags = ACM_EP_FLAG_SOURCE; +- ucma_copy_rai_addr(data, (*rai)->ai_src_addr); ++ ucma_set_ep_addr(data, (*rai)->ai_src_addr); + data++; + msg.hdr.length += ACM_MSG_EP_LENGTH; + } +@@ -362,7 +362,7 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints) + data->flags = ACM_EP_FLAG_DEST; + if ((*rai)->ai_flags & (RAI_NUMERICHOST | RAI_NOROUTE)) + data->flags |= ACM_FLAGS_NODELAY; +- ucma_copy_rai_addr(data, (*rai)->ai_dst_addr); ++ ucma_set_ep_addr(data, (*rai)->ai_dst_addr); + data++; + msg.hdr.length += ACM_MSG_EP_LENGTH; + } -- 2.46.0