refresh

diff --git a/meta b/meta
index e1151361a4a2b5f567d0a7e7d0b1355e562a9297..d66519238e607a25069c343395854632f18e4bf7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 0ba82c702ceed0c56a3217bf2377260bcdadfb2b
-Head: 8f3496f4e6a301f23690db77b8603c8391a2c57d
+Previous: f0922e216af3d85b3056a50451198cfaa1344b38
+Head: ee6aa496369bc10e9975aa1e013445050a1c4510
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
   typo: 07e4480ebb4d54a02271b6935bf60ea1f45aab86
-  ipv4: c151bd5e45629f4eeea22cea3132f9452ff3dfba
-  refresh-temp: 8f3496f4e6a301f23690db77b8603c8391a2c57d
+  ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
 Unapplied:
   daemonize: eb42a0ac783273545fc8a0c93afd7d948aa76d72
   rel-1.0.6: 01c9f3298c9da13ed42a1506e1546abb5c4fcec0

diff --git a/patches/ipv4 b/patches/ipv4
index 945f05e470a73b1ecba7fa23786f18ff23c60b6b..b9b39ba8aca0ba2879ca403780930aaf8751a40b 100644 (file)
--- a/patches/ipv4
+++ b/patches/ipv4
@@ -1,6 +1,6 @@
 Bottom: c5ac2adf6c4b04e769a48314b577a32c646f44d6
-Top:    c5ac2adf6c4b04e769a48314b577a32c646f44d6
-Author: Sean Hefty <sean.hefty@intel.com>
+Top:    ef30d4769ae20a3994fb559aacbb91d3b16e4415
+Author: Hal Rosenstock <hal@mellanox.com>
 Date:   2012-04-05 16:24:09 -0700
 
 ib_acme: Use IPv4 rather than IPv6 when connecting to ACM server
@@ -16,4 +16,15 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/libacm.c b/src/libacm.c
+index 727741f..5ca1abc 100644
+--- a/src/libacm.c
++++ b/src/libacm.c
+@@ -75,6 +75,7 @@ int ib_acm_connect(char *dest)
+ 
+       acm_set_server_port();
+       memset(&hint, 0, sizeof hint);
++      hint.ai_family = AF_INET;
+       hint.ai_protocol = IPPROTO_TCP;
+       ret = getaddrinfo(dest, NULL, &hint, &res);
+       if (ret)

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 3adadaa..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: c5ac2adf6c4b04e769a48314b577a32c646f44d6
-Top:    ef30d4769ae20a3994fb559aacbb91d3b16e4415
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-05 16:25:25 -0700
-
-Refresh of ipv4
-
----
-
-diff --git a/src/libacm.c b/src/libacm.c
-index 727741f..5ca1abc 100644
---- a/src/libacm.c
-+++ b/src/libacm.c
-@@ -75,6 +75,7 @@ int ib_acm_connect(char *dest)
- 
-       acm_set_server_port();
-       memset(&hint, 0, sizeof hint);
-+      hint.ai_family = AF_INET;
-       hint.ai_protocol = IPPROTO_TCP;
-       ret = getaddrinfo(dest, NULL, &hint, &res);
-       if (ret)