refresh (create temporary patch)

diff --git a/meta b/meta
index b2ddd42aad326649551481005efd86974aece735..46f3f24ed48cd2d1d5b9a73aa5521b8ee2e1aa4c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: cd96cb3cca8f6f8d670be3ab36d445532e8018e5
-Head: d28254ead37239006f77e14d30ddbd3ac1b7477a
+Previous: 27e6ab30bc40b6faa1b84e741e3560568521aba2
+Head: 721e8445e70c7ae5e4097022040c7fa38514c446
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
   loop: d28254ead37239006f77e14d30ddbd3ac1b7477a
+  refresh-temp: 721e8445e70c7ae5e4097022040c7fa38514c446
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..205d457
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,30 @@
+Bottom: 1e1d3e8a52d8f13c674a437c666499f303e34507
+Top:    0223e94f89da40cdfe65dac4e8ada06d3874b90d
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-11-17 10:24:36 -0800
+
+Refresh of loop
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 5f7a136..1981878 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -75,7 +75,6 @@ enum acm_loopback_prot
+       ACM_LOOPBACK_PROT_LOCAL
+ };
+ 
+-};
+ /*
+  * Nested locking order: dest -> ep, dest -> port
+  */
+@@ -211,7 +210,7 @@ static char log_file[128] = "stdout";
+ static int log_level = 0;
+ static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
+ static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM;
+-static int loopback_prot = ACM_LOOPBACK_PROT_LOCAL;
++static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;
+ static short server_port = 6125;
+ static int timeout = 2000;
+ static int retries = 15;