refresh

diff --git a/meta b/meta
index 1cfeb03facae6b0d1c26fa2a0feb0169906304b3..6657891b1026ca78959c13ac8c2509902accec2d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 327dd0fe8afa74e77d3a783cedb33dd65fb7d94c
-Head: 25e97ca505427ab5eea2b91a1606aca6f347d378
+Previous: 2f6b7dfc0b7966209e264e2106381045ad6a9db4
+Head: 9bdc367c8d6d3498665bc852503915f7bd4822f2
 Applied:
   acm_snoop: 6d9b27b37026f9090ad55a36f26814f90f3772dd
   log_lid: 6ac592a74d5289b4800c84ef8c20e8ff3f2f263e
   logging: 4ca254f3d8fda6ae709f0c38461f75b9677fa5df
-  dest_string: f2d6e16daffe2f290181234cb9fda5e70dd65691
-  refresh-temp: 25e97ca505427ab5eea2b91a1606aca6f347d378
+  dest_string: 9bdc367c8d6d3498665bc852503915f7bd4822f2
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/dest_string b/patches/dest_string
index 56a41fe58cd397e4477e7b34b01f24fb6e6359ca..947036b7e6661d535808b0c783ccce08c1ee1db6 100644 (file)
--- a/patches/dest_string
+++ b/patches/dest_string
@@ -1,5 +1,5 @@
 Bottom: 9962a940efd219c52418715f8e1c4d496699b292
-Top:    7016809193bd8e087d1be6810d2a754691fc0fb3
+Top:    5d1d9b6d34aa20e4f12b23935ba93a3fe47886aa
 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..ced1e4a 100644
+index daa0985..62623f1 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -75,6 +75,7 @@ enum acm_route_prot
@@ -114,7 +114,7 @@ index daa0985..ced1e4a 100644
        atomic_init(&dest->refcnt);
        atomic_set(&dest->refcnt, 1);
        lock_init(&dest->lock);
-+      acm_format_name(0, dest->name, ACM_MAX_ADDRESS, addr_type, addr, size);
++      acm_format_name(0, dest->name, sizeof dest->name, addr_type, addr, size);
  }
  
  static struct acm_dest *

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 19a2f09..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 7016809193bd8e087d1be6810d2a754691fc0fb3
-Top:    5d1d9b6d34aa20e4f12b23935ba93a3fe47886aa
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-15 17:15:22 -0800
-
-Refresh of dest_string
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index ced1e4a..62623f1 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -283,7 +283,7 @@ acm_init_dest(struct acm_dest *dest, uint8_t addr_type, uint8_t *addr, size_t si
-       atomic_init(&dest->refcnt);
-       atomic_set(&dest->refcnt, 1);
-       lock_init(&dest->lock);
--      acm_format_name(0, dest->name, ACM_MAX_ADDRESS, addr_type, addr, size);
-+      acm_format_name(0, dest->name, sizeof dest->name, addr_type, addr, size);
- }
- 
- static struct acm_dest *