refresh (create temporary patch)

diff --git a/meta b/meta
index 633015439a02815a695ce196a760c8cadcf42bcf..d29ca557079207a1b5ddeb1bdb82d8b69d46ff3c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: fe4da85f6b4e1304e30f7ce88447182a7728e39e
-Head: bc29fc638eb134253a21057788b819de48a085bf
+Previous: 42e63fec504d2c5a2dbaafa818fd1b97d0db80c8
+Head: c02c8dc13ad45d2d7feb5058eb4b28096987c01e
 Applied:
   sa_family: 85be179d2f63865dbf1f5adc1dc76c093c6b811e
   af_ib: bc29fc638eb134253a21057788b819de48a085bf
+  refresh-temp: c02c8dc13ad45d2d7feb5058eb4b28096987c01e
 Unapplied:
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..5716287
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,27 @@
+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++;