refresh (create temporary patch)

diff --git a/meta b/meta
index 3a7404b3d17e9a72cdde3e9844d8729204c66a88..0c0d44e4be4834a0ece95c4800b220a5e87bd4df 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 85dd296e0d7b9d5b8d278c767959227976f26a0f
-Head: cfc76007721d5904ef6346cca0cf1639fa6beca2
+Previous: 8a2df4f5e86197ab7908f51d31d99aec47a18caf
+Head: 9b5acc54ed8ae519a24ee2750c710daeedc3d005
 Applied:
   timeout: 2168f8cc0fe1a67b2565715ef0655866ce904a24
   umask: d204fca2b6298d7799e918141ea8e11e7ad43cec
   acme: cfc76007721d5904ef6346cca0cf1639fa6beca2
+  refresh-temp: 9b5acc54ed8ae519a24ee2750c710daeedc3d005
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..cb54894
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,65 @@
+Bottom: c3e19d5c89c130c5826b49af075f2b7cff999eed
+Top:    9cb1d5b0b8438be2b4dec2a27ca479aa2151d622
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-10-09 15:04:55 -0700
+
+Refresh of acme
+
+---
+
+diff --git a/src/acme.c b/src/acme.c
+index f0ff1e4..81d9e3a 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -61,7 +61,7 @@ enum perf_query_output {
+       PERF_QUERY_ROW,
+       PERF_QUERY_COL
+ };
+-static enum perf_query_outout perf_query;
++static enum perf_query_output perf_query;
+ int verbose;
+ 
+ struct ibv_context **verbs;
+@@ -687,7 +687,7 @@ static void query_perf(char *svc)
+               if (!lables) {
+                       for (i = 0; i < cnt - 1; i++)
+                               printf("%s,", ib_acm_cntr_name(i));
+-                      printf("%s\n", ib_acm_cntr_namer(i));
++                      printf("%s\n", ib_acm_cntr_name(i));
+                       lables = 1;
+               }
+               printf("%s,", svc);
+@@ -791,7 +791,7 @@ int CDECL_FUNC main(int argc, char **argv)
+                       dest_dir = optarg;
+                       break;
+               case 'P':
+-                      if (opt_arg(argc, argv) && !strnicmp("col", opt_arg(argv, argc), 3))
++                      if (opt_arg(argc, argv) && !strnicmp("col", opt_arg(argc, argv), 3))
+                               perf_query = PERF_QUERY_COL;
+                       else
+                               perf_query = PERF_QUERY_ROW;
+diff --git a/src/libacm.c b/src/libacm.c
+index f912322..274eb2d 100644
+--- a/src/libacm.c
++++ b/src/libacm.c
+@@ -370,7 +370,7 @@ const char *ib_acm_cntr_name(int index)
+               [ACM_CNTR_ROUTE_CACHE]  = "Route Cache Count",
+       };
+ 
+-      if (index < ACM_CNTR_ERROR || index > ACM_CNTR_MAX)
++      if (index < ACM_CNTR_ERROR || index > ACM_MAX_COUNTER)
+               return "Unknown";
+ 
+       return cntr_name[index];
+diff --git a/src/libacm.h b/src/libacm.h
+index 0334f60..61220d5 100644
+--- a/src/libacm.h
++++ b/src/libacm.h
+@@ -45,6 +45,6 @@ int ib_acm_resolve_path(struct ibv_path_record *path, uint32_t flags);
+ int ib_acm_query_perf(uint64_t **counters, int *count);
+ #define ib_acm_free_perf(counters) free(counters)
+ 
+-const char *ib_acm_cntr_name(int index)
++const char *ib_acm_cntr_name(int index);
+ 
+ #endif /* LIBACM_H */