refresh

diff --git a/meta b/meta
index ca07dc94bf733e392e9906a6cc8bad0fe2b5650f..56a0da6213c4b494e89675cd6ab5b44b30ca8258 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: d8c5bbed36b6fcbe424a631cc0b56a29a5d04eca
-Head: fbe371cdedbb2611981536c27bde13ceca8652c8
+Previous: dd9a8a4306dfe8ca469916f8d69109f76cd505c9
+Head: 05c3c71ca5b9a5f194b2abb0c4b526a0b848b86f
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -11,8 +11,7 @@ Applied:
   locking: 558e5577364aec3531c54b28def6e16f0c926524
   verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
-  no_addr: ffaa1d84fb9fe7c25052bfb5188dfc2dfeef1b0c
-  refresh-temp: fbe371cdedbb2611981536c27bde13ceca8652c8
+  no_addr: 05c3c71ca5b9a5f194b2abb0c4b526a0b848b86f
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/no_addr b/patches/no_addr
index 427da0b68969d438d5955bb364d77b8ee7953b2f..5b0e95bc45720cf9510e097632804ab45997cf13 100644 (file)
--- a/patches/no_addr
+++ b/patches/no_addr
@@ -1,5 +1,5 @@
 Bottom: 5e7b11ab34ad911d8a6551337d36c51be1b092b4
-Top:    d1f15369c5c58ddc6d2873adb997c555d4f4229a
+Top:    3baf1b9aac461c95718fd03a923208c4eb483a13
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 11:06:47 -0800
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 9ff81c4..1391c70 100644
+index 9ff81c4..b095a07 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -203,6 +203,7 @@ static SOCKET listen_socket;
@@ -28,7 +28,15 @@ index 9ff81c4..1391c70 100644
  static lock_t log_lock;
  PER_THREAD char log_data[ACM_MAX_ADDRESS];
  
-@@ -2261,11 +2262,7 @@ static int acm_assign_ep_names(struct acm_ep *ep)
+@@ -2249,7 +2250,6 @@ err:
+ static int acm_assign_ep_names(struct acm_ep *ep)
+ {
+       char *dev_name;
+-      FILE *f;
+       char s[120];
+       char dev[32], addr[32], pkey_str[8];
+       uint16_t pkey;
+@@ -2261,12 +2261,8 @@ 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);
  
@@ -37,11 +45,13 @@ index 9ff81c4..1391c70 100644
 -              return ACM_STATUS_ENODATA;
 -      }
 -
+-      while (fgets(s, sizeof s, f)) {
 +      rewind(faddr);
-       while (fgets(s, sizeof s, f)) {
++      while (fgets(s, sizeof s, faddr)) {
                if (s[0] == '#')
                        continue;
-@@ -2310,7 +2307,6 @@ static int acm_assign_ep_names(struct acm_ep *ep)
+ 
+@@ -2310,7 +2306,6 @@ static int acm_assign_ep_names(struct acm_ep *ep)
                }
        }
  
@@ -49,7 +59,7 @@ index 9ff81c4..1391c70 100644
        return !index;
  }
  
-@@ -2722,6 +2718,22 @@ static FILE *acm_open_log(void)
+@@ -2722,6 +2717,22 @@ static FILE *acm_open_log(void)
        return f;
  }
  
@@ -72,7 +82,7 @@ index 9ff81c4..1391c70 100644
  static int acm_open_lock_file(void)
  {
        int lock_fd;
-@@ -2813,6 +2825,11 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -2813,6 +2824,11 @@ int CDECL_FUNC main(int argc, char **argv)
        DListInit(&timeout_list);
        event_init(&timeout_event);
  
@@ -84,7 +94,7 @@ index 9ff81c4..1391c70 100644
        umad_init();
        ibdev = ibv_get_device_list(&dev_cnt);
        if (!ibdev) {
-@@ -2825,6 +2842,11 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -2825,6 +2841,11 @@ int CDECL_FUNC main(int argc, char **argv)
                acm_open_dev(ibdev[i]);
  
        ibv_free_device_list(ibdev);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 789a49e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: d1f15369c5c58ddc6d2873adb997c555d4f4229a
-Top:    3baf1b9aac461c95718fd03a923208c4eb483a13
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-06 11:33:51 -0800
-
-Refresh of no_addr
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 1391c70..b095a07 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2250,7 +2250,6 @@ err:
- static int acm_assign_ep_names(struct acm_ep *ep)
- {
-       char *dev_name;
--      FILE *f;
-       char s[120];
-       char dev[32], addr[32], pkey_str[8];
-       uint16_t pkey;
-@@ -2263,7 +2262,7 @@ static int acm_assign_ep_names(struct acm_ep *ep)
-               dev_name, ep->port->port_num, ep->pkey);
- 
-       rewind(faddr);
--      while (fgets(s, sizeof s, f)) {
-+      while (fgets(s, sizeof s, faddr)) {
-               if (s[0] == '#')
-                       continue;