refresh

diff --git a/meta b/meta
index 26285a0554f2aa3b9e396c1c55f1b85709237658..ec7e68ad7655d51ce98b18d56610a5f570ac4d86 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: a08f3ffe35ce910bef10d2dd9363fa21e271e99b
-Head: fcb023c73fe38d2916e6ba14a780fbbd7eea9d65
+Previous: ed261a4bb0d2466935c641b06a77efa235d0de7b
+Head: b9b6f4fddecf13e13dfda57d51f2bf9894ab6162
 Applied:
   rmcfg: 84d811fcdc9f212f243f82594d613b68aea367c4
   acm_notes-txt-change-dos-forma: d76f683c246786876219d6db213643600734d894
   senddep: df6ba3b66ba1c626913faa98316ccab8585769b9
   man-change-dos-formatting-to-u: 097fb5eb23317212b7473485f7f27b550656b466
   update-ib_acme-1-and-ibacm-1-m: be918fdeebd9c58457aaa3ac40363b9c0bee33ba
-  add-the-ability-to-preload-the: e47f5745089c532bd8353f9c83819bf819ced44a
-  refresh-temp: fcb023c73fe38d2916e6ba14a780fbbd7eea9d65
+  add-the-ability-to-preload-the: b9b6f4fddecf13e13dfda57d51f2bf9894ab6162
 Unapplied:
   add-description-of-preloading-: 34a336c9c22434ddd543c9eba7bf1ad16f8d0f23
   increase-buffer-space-for-inet: a4540bf14a2bd24b5e24bec78ee1a7bbcee957b9

diff --git a/patches/add-the-ability-to-preload-the b/patches/add-the-ability-to-preload-the
index 472e4300c1bf0fa7fddfa4ea1cc57472aa7778d5..1c95bff5c4a2165a2c28c586a2cf7cc6c272614f 100644 (file)
--- a/patches/add-the-ability-to-preload-the
+++ b/patches/add-the-ability-to-preload-the
@@ -1,5 +1,5 @@
 Bottom: a9581cc2dd236a5dc404caa8bfdccfab12140aee
-Top:    af9adbe445ea9d1a99a9e55a35527e88f1c34ba7
+Top:    aa2e67d275fbf01527cb533f11886774e0c31047
 Author: Hal Rosenstock <hal@mellanox.com>
 Date:   2013-06-27 16:48:24 +0300
 
@@ -89,7 +89,7 @@ index 35b79c6..9df6062 100644
  .SH "SEE ALSO"
  ibacm(7), ib_acme(1), rdma_cm(7)
 diff --git a/src/acm.c b/src/acm.c
-index e956b09..c640132 100644
+index e956b09..d37056c 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -1,5 +1,6 @@
@@ -412,10 +412,10 @@ index e956b09..c640132 100644
                        min_mtu = acm_convert_mtu(atoi(value));
                else if (!stricmp("min_rate", opt))
                        min_rate = acm_convert_rate(atoi(value));
-+              else if (!stricmp("path_rec_fmt", opt))
-+                      path_rec_fmt = acm_convert_path_rec_fmt(value);
-+              else if (!stricmp("path_rec_file", opt))
-+                      strcpy(path_rec_file, value);
++              else if (!stricmp("route_preload", opt))
++                      route_preload = acm_convert_route_preload(value);
++              else if (!stricmp("route_data_file", opt))
++                      strcpy(route_data_file, value);
        }
  
        fclose(f);
@@ -423,8 +423,8 @@ index e956b09..c640132 100644
        acm_log(0, "receive depth %d\n", recv_depth);
        acm_log(0, "minimum mtu %d\n", min_mtu);
        acm_log(0, "minimum rate %d\n", min_rate);
-+      acm_log(0, "path record format %d\n", path_rec_fmt);
-+      acm_log(0, "path record file %s\n", path_rec_file);
++      acm_log(0, "route preload %d\n", route_preload);
++      acm_log(0, "route data file %s\n", route_data_file);
  }
  
  static FILE *acm_open_log(void)

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 0122a7e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,39 +0,0 @@
-Bottom: af9adbe445ea9d1a99a9e55a35527e88f1c34ba7
-Top:    aa2e67d275fbf01527cb533f11886774e0c31047
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-06-27 22:59:56 -0700
-
-Refresh of add-the-ability-to-preload-the
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index c640132..d37056c 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -3362,10 +3362,10 @@ static void acm_set_options(void)
-                       min_mtu = acm_convert_mtu(atoi(value));
-               else if (!stricmp("min_rate", opt))
-                       min_rate = acm_convert_rate(atoi(value));
--              else if (!stricmp("path_rec_fmt", opt))
--                      path_rec_fmt = acm_convert_path_rec_fmt(value);
--              else if (!stricmp("path_rec_file", opt))
--                      strcpy(path_rec_file, value);
-+              else if (!stricmp("route_preload", opt))
-+                      route_preload = acm_convert_route_preload(value);
-+              else if (!stricmp("route_data_file", opt))
-+                      strcpy(route_data_file, value);
-       }
- 
-       fclose(f);
-@@ -3389,8 +3389,8 @@ static void acm_log_options(void)
-       acm_log(0, "receive depth %d\n", recv_depth);
-       acm_log(0, "minimum mtu %d\n", min_mtu);
-       acm_log(0, "minimum rate %d\n", min_rate);
--      acm_log(0, "path record format %d\n", path_rec_fmt);
--      acm_log(0, "path record file %s\n", path_rec_file);
-+      acm_log(0, "route preload %d\n", route_preload);
-+      acm_log(0, "route data file %s\n", route_data_file);
- }
- 
- static FILE *acm_open_log(void)