refresh (create temporary patch)

diff --git a/meta b/meta
index 0ecb1748fbc34709ce2fc355275f253716e724e1..c660f27f309a62dedd45e8fcf552693cd99c81f9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: d75604c32c47ba352a6826018f609b91bf991b7a
-Head: 69dd7928ab7eae766fe9f83f472845e141ccdc5d
+Previous: 30f87e17b3fb941bcea76f4a490b7178f0f7bc71
+Head: 83a08e9add98c33858c0ad257a746583443b777c
 Applied:
   sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1
   af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9
   ren-copy-rai: a7ae817991416863772d28d97839ee8daeefb07e
   addrinfo-af-ib: 69dd7928ab7eae766fe9f83f472845e141ccdc5d
+  refresh-temp: 83a08e9add98c33858c0ad257a746583443b777c
 Unapplied:
   addrtype: 309c277eb6e1fa2d256b96c33dc4f1d85238a3dc
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..1fdaff9
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,35 @@
+Bottom: 8b6bb37c12c4672472e625ad648944ae8c0ebf16
+Top:    0fe9873298edf4cada887e75c401246a8cdab420
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-29 16:30:22 -0700
+
+Refresh of addrinfo-af-ib
+
+---
+
+diff --git a/src/addrinfo.c b/src/addrinfo.c
+index f606470..44496cc 100755
+--- a/src/addrinfo.c
++++ b/src/addrinfo.c
+@@ -174,8 +174,8 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai,
+               if (ai->ai_canonname)
+                       rai->ai_src_canonname = strdup(ai->ai_canonname);
+ 
+-              if ((ai->ai_flags & RAI_FAMILY) && (rai->ai_family == AF_IB) &&
+-                  (ai->ai_flags & RAI_NUMERICHOST)) {
++              if ((hints->ai_flags & RAI_FAMILY) && (hints->ai_family == AF_IB) &&
++                  (hints->ai_flags & RAI_NUMERICHOST)) {
+                       ret = ucma_convert_in6((struct sockaddr_ib **) &rai->ai_src_addr,
+                                              &rai->ai_src_len,
+                                              (struct sockaddr_in6 *) ai->ai_addr,
+@@ -188,8 +188,8 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai,
+               if (ai->ai_canonname)
+                       rai->ai_dst_canonname = strdup(ai->ai_canonname);
+ 
+-              if ((ai->ai_flags & RAI_FAMILY) && (rai->ai_family == AF_IB) &&
+-                  (ai->ai_flags & RAI_NUMERICHOST)) {
++              if ((hints->ai_flags & RAI_FAMILY) && (hints->ai_family == AF_IB) &&
++                  (hints->ai_flags & RAI_NUMERICHOST)) {
+                       ret = ucma_convert_in6((struct sockaddr_ib **) &rai->ai_dst_addr,
+                                              &rai->ai_dst_len,
+                                              (struct sockaddr_in6 *) ai->ai_addr,