refresh

diff --git a/meta b/meta
index 00cb7b1aa7e2d73e23c2bba33a47dd62ea6ce44f..fe49d0b08573b3b52e4845017611eeaf03e504d4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: cf8feed3187e0641fddc287495548d3e19e00e4f
-Head: 849edd5c3e74f8f8fc148593f60a5a08d8f1dd52
+Previous: 6280470a409314d46b246698e14c74a3cc5b1339
+Head: 3dc208def66463660ee185a0346722561e7c2448
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -13,8 +13,7 @@ Applied:
   dbg_1: 3258ebd9b3f17653231089184f29ee2352be9d46
   no_addr: 775cf275e0feddd7b884ded8cdc341a919e4f9a6
   log_port: 92f81cd1f299db9d83aa21d794cfdfc4c4b5794f
-  nodelay: 07d66b4704e25e93240186d7040b8ad3ceeeae9a
-  refresh-temp: 849edd5c3e74f8f8fc148593f60a5a08d8f1dd52
+  nodelay: 3dc208def66463660ee185a0346722561e7c2448
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/nodelay b/patches/nodelay
index 7c36ae8ef93a77ffe82d0e307c476e2e771d7419..3136201a8aeb58e14df2a85b18378cf6b4338371 100644 (file)
--- a/patches/nodelay
+++ b/patches/nodelay
@@ -1,5 +1,5 @@
 Bottom: 5cb19eb81ed40ac6bba59f5d10974e9fc25a49af
-Top:    9a270ff78976ad2fad44919c3ccfde93246bfe39
+Top:    6b1a8889e0c9bde043dfd2126fed3c613bff07a0
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 13:07:41 -0800
 
@@ -49,6 +49,22 @@ index 0c0e332..52000a3 100644
  \-A\r
  With this option, the ib_acme utility automatically generates the address\r
  configuration file acm_addr.cfg.  The generated file is\r
+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;
 diff --git a/src/acme.c b/src/acme.c
 index cc34577..3ee2073 100644
 --- a/src/acme.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 29acf63..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,25 +0,0 @@
-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;