refresh (create temporary patch)

diff --git a/meta b/meta
index 694a9bcf855091d0860f6d1a86c729b0eb0c741f..23570e624f0274afe3927f7ec13cc6140a74398c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: f40a78d6da3b635f760b235c91d1fc86f5583ebc
-Head: f98ce7c3d4d19bb1a3fab5d0adbe97fd6a84e805
+Previous: 2c404e84a4179a146763db48dc78ccb0ff18db47
+Head: a25924a9e1410116a1c082e3f3ed0079d33ca93a
 Applied:
   sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1
   af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9
   ren-copy-rai: a7ae817991416863772d28d97839ee8daeefb07e
   addrinfo-af-ib: f98ce7c3d4d19bb1a3fab5d0adbe97fd6a84e805
+  refresh-temp: a25924a9e1410116a1c082e3f3ed0079d33ca93a
 Unapplied:
   addrtype: dd53d1f64d9b219a872c151d3ecfaa3f2eeb252c
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..037b441
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,29 @@
+Bottom: 4ce62c6180a5ad6e3d7080ab386b955959166fc1
+Top:    53f00af95df12c3aa07ab0835c666a9645b86b7f
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-29 16:14:48 -0700
+
+Refresh of addrinfo-af-ib
+
+---
+
+diff --git a/src/addrinfo.c b/src/addrinfo.c
+index c729720..01c04d1 100755
+--- a/src/addrinfo.c
++++ b/src/addrinfo.c
+@@ -56,9 +56,12 @@
+ static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai)
+ {
+       memset(ai, 0, sizeof *ai);
+-      ai->ai_flags  = (rai->ai_flags & RAI_PASSIVE) ? AI_PASSIVE : 0;
+-      ai->ai_flags |= (rai->ai_flags & RAI_NUMERICHOST) ? AI_NUMERICHOST : 0;
+-      ai->ai_family = rai->ai_family;
++      if (rai->ai_flags & RAI_PASSIVE)
++              ai->ai_flags = AI_PASSIVE;
++      if (rai->ai_flags & RAI_NUMERICHOST)
++              ai->ai_flags |= AI_NUMERICHOST;
++      if (rai->ai_family != AF_IB)
++              ai->ai_family = rai->ai_family;
+ 
+       switch (rai->ai_qp_type) {
+       case IBV_QPT_RC: