refresh

diff --git a/meta b/meta
index d27d5d8afa0d92d5f8b149eb58dbe80a8ebffc84..2b711aae29dd284547d2c9a9231e1299a4d32085 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: ba409ba1478f73baf9fa29ebbd15b6a24b06b29f
-Head: 2fec0e247391ddfd9dc9e5d99e781a35d8cd8328
+Previous: 8678f5fe61d43ccf147b68afe23824070d75f5ff
+Head: 8fd9f7f3d46b6a08f06c6fd4e725d02118b3be90
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -13,8 +13,7 @@ Applied:
   dbg_1: 3258ebd9b3f17653231089184f29ee2352be9d46
   no_addr: 775cf275e0feddd7b884ded8cdc341a919e4f9a6
   log_port: 92f81cd1f299db9d83aa21d794cfdfc4c4b5794f
-  nodelay: 3dc208def66463660ee185a0346722561e7c2448
-  refresh-temp: 2fec0e247391ddfd9dc9e5d99e781a35d8cd8328
+  nodelay: 8fd9f7f3d46b6a08f06c6fd4e725d02118b3be90
 Unapplied:
   acme_dest: f5cc9c1794700bda0a62967250a00ea9bae5839e
   show_err: aadb98a10bf5192f36dba186eefb696794864ad6

diff --git a/patches/nodelay b/patches/nodelay
index 3136201a8aeb58e14df2a85b18378cf6b4338371..1343643f5b8fb8924af24d44f32c67bce0598285 100644 (file)
--- a/patches/nodelay
+++ b/patches/nodelay
@@ -1,5 +1,5 @@
 Bottom: 5cb19eb81ed40ac6bba59f5d10974e9fc25a49af
-Top:    6b1a8889e0c9bde043dfd2126fed3c613bff07a0
+Top:    adca8d637b4f5537a0e81727a25fec931a002965
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 13:07:41 -0800
 
@@ -50,10 +50,43 @@ index 0c0e332..52000a3 100644
  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
+index ceb72f6..0a9c1c9 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)
+@@ -1914,8 +1914,7 @@ acm_svr_verify_resolve(struct acm_resolve_msg *msg,
+ 
+       cnt = (msg->hdr.length - ACM_MSG_HDR_LENGTH) / ACM_MSG_EP_LENGTH;
+       for (i = 0; i < cnt; i++) {
+-              switch (msg->data[i].flags) {
+-              case ACM_EP_FLAG_SOURCE:
++              if (msg->data[i].flags & ACM_EP_FLAG_SOURCE) {
+                       if (src) {
+                               acm_log(0, "ERROR - multiple sources specified\n");
+                               return ACM_STATUS_ESRCADDR;
+@@ -1925,8 +1924,8 @@ acm_svr_verify_resolve(struct acm_resolve_msg *msg,
+                               return ACM_STATUS_ESRCTYPE;
+                       }
+                       src = &msg->data[i];
+-                      break;
+-              case ACM_EP_FLAG_DEST:
++              }
++              if (msg->data[i].flags & ACM_EP_FLAG_DEST) {
+                       if (dst) {
+                               acm_log(0, "ERROR - multiple destinations specified\n");
+                               return ACM_STATUS_EDESTADDR;
+@@ -1936,11 +1935,6 @@ acm_svr_verify_resolve(struct acm_resolve_msg *msg,
+                               return ACM_STATUS_EDESTTYPE;
+                       }
+                       dst = &msg->data[i];
+-                      break;
+-              default:
+-                      acm_log(0, "ERROR - unexpected endpoint flags 0x%x\n",
+-                              msg->data[i].flags);
+-                      return ACM_STATUS_EINVAL;
+               }
+       }
+ 
+@@ -2040,6 +2034,11 @@ acm_svr_resolve(struct acm_client *client, struct acm_resolve_msg *msg)
                /* fall through */
        default:
  queue:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 3aabf35..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,45 +0,0 @@
-Bottom: 6b1a8889e0c9bde043dfd2126fed3c613bff07a0
-Top:    adca8d637b4f5537a0e81727a25fec931a002965
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-07 09:18:01 -0800
-
-Refresh of nodelay
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 61a8b3b..0a9c1c9 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1914,8 +1914,7 @@ acm_svr_verify_resolve(struct acm_resolve_msg *msg,
- 
-       cnt = (msg->hdr.length - ACM_MSG_HDR_LENGTH) / ACM_MSG_EP_LENGTH;
-       for (i = 0; i < cnt; i++) {
--              switch (msg->data[i].flags) {
--              case ACM_EP_FLAG_SOURCE:
-+              if (msg->data[i].flags & ACM_EP_FLAG_SOURCE) {
-                       if (src) {
-                               acm_log(0, "ERROR - multiple sources specified\n");
-                               return ACM_STATUS_ESRCADDR;
-@@ -1925,8 +1924,8 @@ acm_svr_verify_resolve(struct acm_resolve_msg *msg,
-                               return ACM_STATUS_ESRCTYPE;
-                       }
-                       src = &msg->data[i];
--                      break;
--              case ACM_EP_FLAG_DEST:
-+              }
-+              if (msg->data[i].flags & ACM_EP_FLAG_DEST) {
-                       if (dst) {
-                               acm_log(0, "ERROR - multiple destinations specified\n");
-                               return ACM_STATUS_EDESTADDR;
-@@ -1936,11 +1935,6 @@ acm_svr_verify_resolve(struct acm_resolve_msg *msg,
-                               return ACM_STATUS_EDESTTYPE;
-                       }
-                       dst = &msg->data[i];
--                      break;
--              default:
--                      acm_log(0, "ERROR - unexpected endpoint flags 0x%x\n",
--                              msg->data[i].flags);
--                      return ACM_STATUS_EINVAL;
-               }
-       }