Version: 1
-Previous: 4602d9a497d78b5e443df1f8a52d4f2ac6b6c3b7
-Head: 62f285195e25a4893fc609576f195b4f70e66101
+Previous: 3d1a70b43c5e2153ff8f14b3b60d50770af0bdb8
+Head: ab5b87357a8daedf2d823527d7018eb488dfcca2
Applied:
logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
no_addr: 4d7174e927130db17a5ff83f9279ea4c54fde2fa
log_port: 41078cbc8b08039ac192dfa18dcf5d17b81edf1d
nodelay: 62f285195e25a4893fc609576f195b4f70e66101
+ refresh-temp: ab5b87357a8daedf2d823527d7018eb488dfcca2
Unapplied:
acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37
--- /dev/null
+Bottom: 03a0e5459709b2fb584adeb4e7f8996886fe1ef7
+Top: 94f7b4014bf248f21ef5a43bd9049268ee765a26
+Author: Sean Hefty <sean.hefty@intel.com>
+Date: 2010-12-06 15:17:19 -0800
+
+Refresh of nodelay
+
+---
+
+diff --git a/include/infiniband/acm.h b/include/infiniband/acm.h
+index d193d43..41b95b8 100644
+--- a/include/infiniband/acm.h
++++ b/include/infiniband/acm.h
+@@ -51,6 +51,7 @@
+ #define ACM_STATUS_EDESTTYPE 10
+
+ #define ACM_FLAGS_QUERY_SA (1<<31)
++#define ACM_FLAGS_NODELAY (1<<30)
+
+ #define ACM_MSG_HDR_LENGTH 16
+ #define ACM_MAX_ADDRESS 64
+diff --git a/src/acme.c b/src/acme.c
+index cc34577..f14912a 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -70,6 +70,7 @@ static void show_usage(char *program)
+ printf(" -s src_addr - format defined by -f option\n");
+ printf(" -d dest_addr - format defined by -f option\n");
+ printf(" [-v] - verify ACM response against SA query response\n");
++ printf(" [-c] - read ACM cached data only\n")
+ printf("usage 2: %s\n", program);
+ printf(" -A [addr_file] - generate local address configuration file\n");
+ printf(" (default is %s)\n", ACM_ADDR_FILE);
+@@ -550,7 +551,7 @@ int CDECL_FUNC main(int argc, char **argv)
+ if (ret)
+ goto out;
+
+- while ((op = getopt(argc, argv, "f:s:d:vA::O::D:V")) != -1) {
++ while ((op = getopt(argc, argv, "f:s:d:vcA::O::D:V")) != -1) {
+ switch (op) {
+ case 'f':
+ addr_type = optarg[0];
+@@ -564,6 +565,9 @@ int CDECL_FUNC main(int argc, char **argv)
+ case 'v':
+ verify = 1;
+ break;
++ case 'c':
++ nodelay = 1;
++ break;
+ case 'A':
+ make_addr = 1;
+ if (opt_arg(argc, argv))