pop

diff --git a/meta b/meta
index f8b0553cba12973f5e9e1dd40db1836a814e8e3c..2e80f8a2762bf2ab66f9910f9d05a53f93b5ba06 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 545fa46b3cab0363d6671c21e32e69320535a066
-Head: 71bed462cc3d62031723ce0872b4e1de68861550
+Previous: 5ec116894ee7d3280934cc780ea08f54b60fdbf0
+Head: b09733181e36a5dcedf45dc827333ce454544afa
 Applied:
   typo: e733d04dcaf637e600b3f1873befa4e8eaef4f83
   daemon: 71bed462cc3d62031723ce0872b4e1de68861550
+  cfg: b09733181e36a5dcedf45dc827333ce454544afa
 Unapplied:
-  cfg: 66af10c14df1055d97422bc056dc0897ac3a2773
   log: cbe50bfc0ec5aa61f08083722d2b3d53791195a9
 Hidden:

diff --git a/patches/cfg b/patches/cfg
index 22853171a8e17af387cc806fa67b4ed3043e4c01..ec21e67ec4cd7f9785b601b553f140a73a578747 100644 (file)
--- a/patches/cfg
+++ b/patches/cfg
@@ -1,5 +1,5 @@
-Bottom: d4ad38b0621522078c4a0701602ea4b83a80e903
-Top:    a9a7ff03d17186f855af81adb232170085e921d9
+Bottom: 618c8524a45af7aa859abee4fa52733e6545dac9
+Top:    abe96573dde00ea8ceaed459ab3abf0f310754e7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-23 17:12:24 -0700
 
@@ -39,10 +39,10 @@ index dc8bc1f..722e1b1
  #define CDECL_FUNC\r
  \r
 diff --git a/src/acm.c b/src/acm.c
-index 2b1e1fd..48e622d 100755
+index 8b09453..535a755 100755
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -191,6 +191,8 @@ static struct acm_client client[FD_SETSIZE - 1];
+@@ -190,6 +190,8 @@ static struct acm_client client[FD_SETSIZE - 1];
  static FILE *flog;
  static lock_t log_lock;
  
@@ -51,7 +51,7 @@ index 2b1e1fd..48e622d 100755
  static char log_file[128] = "stdout";
  static int log_level = 0;
  static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
-@@ -2198,7 +2200,7 @@ static int acm_assign_ep_names(struct acm_ep *ep)
+@@ -2197,7 +2199,7 @@ static int acm_assign_ep_names(struct acm_ep *ep)
        acm_log(1, "device %s, port %d, pkey 0x%x\n",
                dev_name, ep->port->port_num, ep->pkey);
  
@@ -60,7 +60,7 @@ index 2b1e1fd..48e622d 100755
                acm_log(0, "ERROR - unable to open acm_addr.cfg file\n");
                return ACM_STATUS_ENODATA;
        }
-@@ -2537,7 +2539,7 @@ static void acm_set_options(void)
+@@ -2536,7 +2538,7 @@ static void acm_set_options(void)
        char s[120];
        char opt[32], value[32];
  
@@ -69,7 +69,7 @@ index 2b1e1fd..48e622d 100755
                return;
  
        while (fgets(s, sizeof s, f)) {
-@@ -2638,7 +2640,11 @@ static void daemonize(void)
+@@ -2637,7 +2639,11 @@ static void daemonize(void)
  static void show_usage(char *program)
  {
        printf("usage: %s\n", program);
@@ -82,7 +82,7 @@ index 2b1e1fd..48e622d 100755
  }
  
  int CDECL_FUNC main(int argc, char **argv)
-@@ -2647,11 +2653,17 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -2646,11 +2652,17 @@ int CDECL_FUNC main(int argc, char **argv)
        int dev_cnt;
        int op, i, daemon = 0;