refresh (create temporary patch)

diff --git a/meta b/meta
index 9e2656e9c1ebd4d012f78f953bc7e07a1f4a055e..00cb7b1aa7e2d73e23c2bba33a47dd62ea6ce44f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 077872d91a62732201fb08d75661cdabcf505a9b
-Head: 07d66b4704e25e93240186d7040b8ad3ceeeae9a
+Previous: cf8feed3187e0641fddc287495548d3e19e00e4f
+Head: 849edd5c3e74f8f8fc148593f60a5a08d8f1dd52
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -14,6 +14,7 @@ Applied:
   no_addr: 775cf275e0feddd7b884ded8cdc341a919e4f9a6
   log_port: 92f81cd1f299db9d83aa21d794cfdfc4c4b5794f
   nodelay: 07d66b4704e25e93240186d7040b8ad3ceeeae9a
+  refresh-temp: 849edd5c3e74f8f8fc148593f60a5a08d8f1dd52
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..29acf63
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,25 @@
+Bottom: 9a270ff78976ad2fad44919c3ccfde93246bfe39
+Top:    6b1a8889e0c9bde043dfd2126fed3c613bff07a0
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-12-06 16:03:04 -0800
+
+Refresh of nodelay
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index ceb72f6..61a8b3b 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -2040,6 +2040,11 @@ acm_svr_resolve(struct acm_client *client, struct acm_resolve_msg *msg)
+               /* fall through */
+       default:
+ queue:
++              if (daddr->flags & ACM_FLAGS_NODELAY) {
++                      acm_log(2, "lookup initiated, but client wants no delay\n");
++                      status = ACM_STATUS_ENODATA;
++                      break;
++              }
+               status = acm_svr_queue_req(dest, client, msg);
+               if (status) {
+                       break;