refresh

diff --git a/meta b/meta
index ff4a881fb7556be9a3cc02b28214045615bdc666..6e8ae143a83c4465ab68297d85a443f5d32da177 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 7c21fe9ac27bf744b27fa52414df6253273b93cd
-Head: 9dfc33aabcaf0461593364a051602bb0d6728fe5
+Previous: e220318a508779ef1d32b4e1936368e1e4f120b1
+Head: b7006f6be2866d81738c2f4fd2e9451e44cbd2b0
 Applied:
   rmcfg: 84d811fcdc9f212f243f82594d613b68aea367c4
   acm_notes-txt-change-dos-forma: d76f683c246786876219d6db213643600734d894
@@ -10,8 +10,7 @@ Applied:
   add-the-ability-to-preload-the: 0536bcd1611e365b2aeb7fd2fa68cec9ee1922b0
   add-description-of-preloading-: 5765f7d237b191c036c032e0c4beb00123f68baf
   increase-buffer-space-for-inet: 70596420225d4a1a4fac908e56eb9578e18a8994
-  ib_acme-c-support-ipv6-address: c886216e3a24b8317405b499833c1536c34bbb29
-  refresh-temp: 9dfc33aabcaf0461593364a051602bb0d6728fe5
+  ib_acme-c-support-ipv6-address: b7006f6be2866d81738c2f4fd2e9451e44cbd2b0
 Unapplied:
   convert-linux-header-files-fro: aed0b8ab0d23ffa04905fcc3750fa7936cd1bf05
   add-support-for-preloading-ipv: a8e1f8072435c8beae5fe6cdc91c993b7134b4bd

diff --git a/patches/ib_acme-c-support-ipv6-address b/patches/ib_acme-c-support-ipv6-address
index 7ad815189b96a22d4a289e9ed3075c12c06d4072..a46a7a0f358483ce8e1f62dd15795a8d652a339b 100644 (file)
--- a/patches/ib_acme-c-support-ipv6-address
+++ b/patches/ib_acme-c-support-ipv6-address
@@ -1,5 +1,5 @@
 Bottom: 0a2dea967d01d2c424b8332f5570dbaaad1609b8
-Top:    e017b2a967a37d94799685949f1ae2ce10771c04
+Top:    7ef6e7807472c68736cac0d9acb07fe5f6a22546
 Author: Hal Rosenstock <hal@mellanox.com>
 Date:   2013-06-20 00:18:23 +0300
 
@@ -12,10 +12,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acme.c b/src/acme.c
-index 8bdb938..2f39cd6 100644
+index 8bdb938..2b89a18 100644
 --- a/src/acme.c
 +++ b/src/acme.c
-@@ -476,33 +476,54 @@ static uint32_t get_resolve_flags()
+@@ -476,32 +476,53 @@ static uint32_t get_resolve_flags()
        return flags;
  }
  
@@ -67,13 +67,11 @@ index 8bdb938..2f39cd6 100644
                return -1;
        }
  
--      ret = ib_acm_resolve_ip(saddr, (struct sockaddr *) &dest,
 +      if (src_addr && src.ss_family != dest.ss_family) {
 +              printf("source and destination address families don't match\n");
 +              return -1;
 +      }
 +
-+      ret = ib_acm_resolve_ip(saddr, (struct sockaddr *) &dest),
+       ret = ib_acm_resolve_ip(saddr, (struct sockaddr *) &dest,
                &paths, &count, get_resolve_flags());
        if (ret) {
-               printf("ib_acm_resolve_ip failed: %s\n", strerror(errno));

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d381dc6..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: e017b2a967a37d94799685949f1ae2ce10771c04
-Top:    7ef6e7807472c68736cac0d9acb07fe5f6a22546
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-06-27 23:27:19 -0700
-
-Refresh of ib_acme-c-support-ipv6-address
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 2f39cd6..2b89a18 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -523,7 +523,7 @@ static int resolve_ip(struct ibv_path_record *path)
-               return -1;
-       }
- 
--      ret = ib_acm_resolve_ip(saddr, (struct sockaddr *) &dest),
-+      ret = ib_acm_resolve_ip(saddr, (struct sockaddr *) &dest,
-               &paths, &count, get_resolve_flags());
-       if (ret) {
-               printf("ib_acm_resolve_ip failed: %s\n", strerror(errno));