refresh

diff --git a/meta b/meta
index f7cc8f39cc167cb80a0a359d392b274ca27d5ab0..0fb6dce315b2a40a61bd483ba9b814f47a9eee82 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 0d8e855c451546caa9fd8deecfe04a2bfc9d397d
-Head: 45d7cbcc273f70e51719f0673267f0cb0f5cfcb3
+Previous: 8eac4fb5ba117d1e30b8b8726a63d56b45c381b3
+Head: 5294e3eab7b92f06b7d184b2ade2966122c07b49
 Applied:
   af_ib: 35b4fe1c3e856dee01d437af0950a3ff2e59dade
-  sa_family: b64f5de64499922645e9d4f7de5e052d9ba9358f
-  refresh-temp: 45d7cbcc273f70e51719f0673267f0cb0f5cfcb3
+  sa_family: 5294e3eab7b92f06b7d184b2ade2966122c07b49
 Unapplied:
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9897298..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,60 +0,0 @@
-Bottom: 1f3e91359a2a6d34a157b3b986b2afac307079ae
-Top:    b818a49f265b98fc20de6ebcd8b46a3d2e72a1d8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-23 15:56:47 -0700
-
-Refresh of sa_family
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 458e23d..d96dbcd 100755
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -258,6 +258,8 @@ static void ucma_ib_save_resp(struct rdma_addrinfo *rai, cma_acm_msg_t *msg)
-       struct acm_ep_addr_data *ep_data;
-       struct ibv_path_data *path_data = NULL;
-       struct ibv_path_record *pri_path = NULL;
-+      struct sockaddr_in *sin;
-+      struct sockaddr_in6 *sin6;
-       int i, cnt, path_cnt = 0;
- 
-       cnt = (msg->hdr.length - ACM_MSG_HDR_LENGTH) / ACM_MSG_EP_LENGTH;
-@@ -277,25 +279,27 @@ static void ucma_ib_save_resp(struct rdma_addrinfo *rai, cma_acm_msg_t *msg)
-                       if (!(ep_data->flags & ACM_EP_FLAG_SOURCE) || rai->ai_src_len)
-                               break;
- 
--                      rai->ai_src_addr = calloc(1, sizeof(struct sockaddr_in));
--                      if (!rai->ai_src_addr)
-+                      sin = calloc(1, sizeof(*sin));
-+                      if (!sin)
-                               break;
- 
--                      rai->ai_src_len = sizeof(struct sockaddr_in);
--                      memcpy(&((struct sockaddr_in *) rai->ai_src_addr)->sin_addr,
--                             &ep_data->info.addr, 4);
-+                      sin->sin_family = AF_INET;
-+                      memcpy(&sin->sin_addr, &ep_data->info.addr, 4);
-+                      rai->ai_src_len = sizeof(*sin);
-+                      rai->ai_src_addr = (struct sockaddr *) sin;
-                       break;
-               case ACM_EP_INFO_ADDRESS_IP6:
-                       if (!(ep_data->flags & ACM_EP_FLAG_SOURCE) || rai->ai_src_len)
-                               break;
- 
--                      rai->ai_src_addr = calloc(1, sizeof(struct sockaddr_in6));
--                      if (!rai->ai_src_addr)
-+                      sin6 = calloc(1, sizeof(*sin6));
-+                      if (!sin6)
-                               break;
- 
--                      rai->ai_src_len = sizeof(struct sockaddr_in6);
--                      memcpy(&((struct sockaddr_in6 *) rai->ai_src_addr)->sin6_addr,
--                             &ep_data->info.addr, 16);
-+                      sin6->sin6_family = AF_INET6;
-+                      memcpy(&sin6->sin6_addr, &ep_data->info.addr, 16);
-+                      rai->ai_src_len = sizeof(*sin6);
-+                      rai->ai_src_addr = (struct sockaddr *) sin6;
-                       break;
-               default:
-                       break;

diff --git a/patches/sa_family b/patches/sa_family
index 880058711555f1f41e07864c5aaa272d4875e1ac..6ef037e987d4797490de65a7714456985f809ed5 100644 (file)
--- a/patches/sa_family
+++ b/patches/sa_family
@@ -1,5 +1,5 @@
 Bottom: 1f3e91359a2a6d34a157b3b986b2afac307079ae
-Top:    1f3e91359a2a6d34a157b3b986b2afac307079ae
+Top:    b818a49f265b98fc20de6ebcd8b46a3d2e72a1d8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-23 15:48:06 -0700
 
@@ -13,4 +13,54 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index 458e23d..d96dbcd 100755
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -258,6 +258,8 @@ static void ucma_ib_save_resp(struct rdma_addrinfo *rai, cma_acm_msg_t *msg)
+       struct acm_ep_addr_data *ep_data;
+       struct ibv_path_data *path_data = NULL;
+       struct ibv_path_record *pri_path = NULL;
++      struct sockaddr_in *sin;
++      struct sockaddr_in6 *sin6;
+       int i, cnt, path_cnt = 0;
+ 
+       cnt = (msg->hdr.length - ACM_MSG_HDR_LENGTH) / ACM_MSG_EP_LENGTH;
+@@ -277,25 +279,27 @@ static void ucma_ib_save_resp(struct rdma_addrinfo *rai, cma_acm_msg_t *msg)
+                       if (!(ep_data->flags & ACM_EP_FLAG_SOURCE) || rai->ai_src_len)
+                               break;
+ 
+-                      rai->ai_src_addr = calloc(1, sizeof(struct sockaddr_in));
+-                      if (!rai->ai_src_addr)
++                      sin = calloc(1, sizeof(*sin));
++                      if (!sin)
+                               break;
+ 
+-                      rai->ai_src_len = sizeof(struct sockaddr_in);
+-                      memcpy(&((struct sockaddr_in *) rai->ai_src_addr)->sin_addr,
+-                             &ep_data->info.addr, 4);
++                      sin->sin_family = AF_INET;
++                      memcpy(&sin->sin_addr, &ep_data->info.addr, 4);
++                      rai->ai_src_len = sizeof(*sin);
++                      rai->ai_src_addr = (struct sockaddr *) sin;
+                       break;
+               case ACM_EP_INFO_ADDRESS_IP6:
+                       if (!(ep_data->flags & ACM_EP_FLAG_SOURCE) || rai->ai_src_len)
+                               break;
+ 
+-                      rai->ai_src_addr = calloc(1, sizeof(struct sockaddr_in6));
+-                      if (!rai->ai_src_addr)
++                      sin6 = calloc(1, sizeof(*sin6));
++                      if (!sin6)
+                               break;
+ 
+-                      rai->ai_src_len = sizeof(struct sockaddr_in6);
+-                      memcpy(&((struct sockaddr_in6 *) rai->ai_src_addr)->sin6_addr,
+-                             &ep_data->info.addr, 16);
++                      sin6->sin6_family = AF_INET6;
++                      memcpy(&sin6->sin6_addr, &ep_data->info.addr, 16);
++                      rai->ai_src_len = sizeof(*sin6);
++                      rai->ai_src_addr = (struct sockaddr *) sin6;
+                       break;
+               default:
+                       break;