refresh

diff --git a/meta b/meta
index 40f8a84c0e848d641d9f527c000a9cc24cab7f3f..f5e259f89847e116d1af796d1de642d2c345338c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 0587cde929ff026c2f56358849c51240c32d9fd8
-Head: d11beba420d15ce8f050e27eaf07c6a2bad8f9b7
+Previous: 608a570f5ff61bd248f1bcc5d3fb49148e223339
+Head: 338aa2a7e68f2cb32cb6d43d1ac4f837b3df2e6f
 Applied:
   acm_snoop: 6d9b27b37026f9090ad55a36f26814f90f3772dd
   log_lid: 6ac592a74d5289b4800c84ef8c20e8ff3f2f263e
   logging: 4ca254f3d8fda6ae709f0c38461f75b9677fa5df
-  dest_string: 98c3e5fdd72ffbd86fa5c0cdec79f210adf2e348
-  refresh-temp: d11beba420d15ce8f050e27eaf07c6a2bad8f9b7
+  dest_string: 338aa2a7e68f2cb32cb6d43d1ac4f837b3df2e6f
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/dest_string b/patches/dest_string
index 1ffedd063a2f2ad41f5c52d7222e8ada939e5873..c163991cfd8f2f780a76904413e098505d5237e4 100644 (file)
--- a/patches/dest_string
+++ b/patches/dest_string
@@ -1,5 +1,5 @@
 Bottom: 9962a940efd219c52418715f8e1c4d496699b292
-Top:    47378cdb2e1152902e00ec13bd915b1ec030aca5
+Top:    27691ed590ac790c78441a99f97e4ba9c02ec348
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-15 14:42:59 -0800
 
@@ -28,7 +28,7 @@ index 28c3647..33ea842 100644
  {\r
        pthread_t thread;\r
 diff --git a/src/acm.c b/src/acm.c
-index daa0985..6d83105 100644
+index daa0985..fa915f1 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -75,6 +75,7 @@ enum acm_route_prot
@@ -43,7 +43,7 @@ index daa0985..6d83105 100644
        uint8_t               *recv_bufs;
        DLIST_ENTRY           entry;
        union acm_ep_info     addr[MAX_EP_ADDR];
-+      char                  name[MAX_EP_ADDR][MAX_ACM_ADDRESS];
++      char                  name[MAX_EP_ADDR][ACM_MAX_ADDRESS];
        uint8_t               addr_type[MAX_EP_ADDR];
        void                  *dest_map[ACM_ADDRESS_RESERVED - 1];
        struct acm_dest       mc_dest[MAX_EP_MC];

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 8571fb1..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 47378cdb2e1152902e00ec13bd915b1ec030aca5
-Top:    27691ed590ac790c78441a99f97e4ba9c02ec348
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-15 17:17:57 -0800
-
-Refresh of dest_string
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 6d83105..fa915f1 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -136,7 +136,7 @@ struct acm_ep
-       uint8_t               *recv_bufs;
-       DLIST_ENTRY           entry;
-       union acm_ep_info     addr[MAX_EP_ADDR];
--      char                  name[MAX_EP_ADDR][MAX_ACM_ADDRESS];
-+      char                  name[MAX_EP_ADDR][ACM_MAX_ADDRESS];
-       uint8_t               addr_type[MAX_EP_ADDR];
-       void                  *dest_map[ACM_ADDRESS_RESERVED - 1];
-       struct acm_dest       mc_dest[MAX_EP_MC];