From 5cc7d97a5eabd834e94390b23d0cc6386a371f9c Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 30 Aug 2012 17:09:17 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/addrinfo-af-ib | 6 +++--- patches/refresh-temp | 21 --------------------- 3 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index f3762ad6..ebd609cc 100644 --- a/meta +++ b/meta @@ -1,12 +1,11 @@ Version: 1 -Previous: 3b218dfd00e5da7bd5dd3b6f44cff21915b96f41 -Head: 67d47fe0d34d92dcce5da593a3e5768556fc9b94 +Previous: 5e590d35bdd7072c5fb28cbfb25a6362d9841345 +Head: 314cddd485a8175f72ae6bc681398451af3bd4d5 Applied: sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1 af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9 ren-copy-rai: a7ae817991416863772d28d97839ee8daeefb07e - addrinfo-af-ib: 367cdab6bfd9a8feb543d2ffb9f0001815eabdef - refresh-temp: 67d47fe0d34d92dcce5da593a3e5768556fc9b94 + addrinfo-af-ib: 314cddd485a8175f72ae6bc681398451af3bd4d5 Unapplied: addrtype: 309c277eb6e1fa2d256b96c33dc4f1d85238a3dc dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a diff --git a/patches/addrinfo-af-ib b/patches/addrinfo-af-ib index dfdc6851..ee4d469e 100644 --- a/patches/addrinfo-af-ib +++ b/patches/addrinfo-af-ib @@ -1,5 +1,5 @@ Bottom: 4e01eb8a1c0681cd7bcca9c1bf3502036b929d4b -Top: 774b4e7c039a9a06577acf93861d5a87e9ccf6d8 +Top: b41f5d11d3f72c1bbe451336c858f7ebfb0a4da7 Author: Sean Hefty Date: 2012-08-28 12:33:04 -0700 @@ -112,7 +112,7 @@ index 95eee73..76fc466 100755 } diff --git a/src/addrinfo.c b/src/addrinfo.c -index 2da35f0..a89aa88 100755 +index 2da35f0..9c43043 100755 --- a/src/addrinfo.c +++ b/src/addrinfo.c @@ -53,12 +53,17 @@ @@ -214,7 +214,7 @@ index 2da35f0..a89aa88 100755 - rai->ai_src_len = ai->ai_addrlen; - rai->ai_src_canonname = canonname; + if (ai->ai_flags & AI_PASSIVE) { -+ rai->ai_flags = RAI_PASSIVE ++ rai->ai_flags = RAI_PASSIVE; + if (ai->ai_canonname) + rai->ai_src_canonname = strdup(ai->ai_canonname); + diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 4d57348d..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,21 +0,0 @@ -Bottom: 774b4e7c039a9a06577acf93861d5a87e9ccf6d8 -Top: b41f5d11d3f72c1bbe451336c858f7ebfb0a4da7 -Author: Sean Hefty -Date: 2012-08-30 17:09:17 -0700 - -Refresh of addrinfo-af-ib - ---- - -diff --git a/src/addrinfo.c b/src/addrinfo.c -index a89aa88..9c43043 100755 ---- a/src/addrinfo.c -+++ b/src/addrinfo.c -@@ -171,7 +171,7 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai, - } - - if (ai->ai_flags & AI_PASSIVE) { -- rai->ai_flags = RAI_PASSIVE -+ rai->ai_flags = RAI_PASSIVE; - if (ai->ai_canonname) - rai->ai_src_canonname = strdup(ai->ai_canonname); -- 2.46.0