refresh (create temporary patch)

diff --git a/meta b/meta
index ca4cbbcbd141f8f7bd78ab2787f0bfef2b7fdc40..a7ce8d247f6d4fb6598060a2853e13bc71f584e5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 418b58817f0609b6e189bd3621c0d20abbfd0619
-Head: ea2aea0c9f863d88df21dd8aa214e3983d99e7d3
+Previous: 4f8811858258a4b08b6ca24faf64073dc8c96f08
+Head: c007c295521b3dce3f454a95516d0c3f9498a4ba
 Applied:
   addr_open: 1fd2bfd86e2e2fe78f9d5d6d39aa5502938923f0
   open_dev: 4687a6571146acd8d9a1553a96e2e4f7e8318761
   ep_active: ea2aea0c9f863d88df21dd8aa214e3983d99e7d3
+  refresh-temp: c007c295521b3dce3f454a95516d0c3f9498a4ba
 Unapplied:
   autoaddr: 36281f18de15f2482e21ae1304f2e34e9ecf187d
   async_mc: c51c6e84981821b2541daba97cee9a29cd1d3709

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..08c522c
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,81 @@
+Bottom: c2eb2f73a26bb1db735a31b311d9902c68afdf8d
+Top:    49af70598cfc4c3312b698b4acd973641bf76f48
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-02-10 11:52:51 -0800
+
+Refresh of ep_active
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 806b133..bc080f2 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -1743,9 +1743,8 @@ static struct acm_ep *
+ acm_get_ep(struct acm_ep_addr_data *data)
+ {
+       struct acm_device *dev;
+-      struct acm_port *port;
+       struct acm_ep *ep;
+-      DLIST_ENTRY *dev_entry, *ep_entry;
++      DLIST_ENTRY *dev_entry;
+       int i;
+ 
+       acm_format_name(2, log_data, sizeof log_data,
+@@ -2378,6 +2377,22 @@ err:
+       return -1;
+ }
+ 
++static FILE *acm_open_addr_file(void)
++{
++      FILE *f;
++
++      if ((f = fopen(addr_file, "r")))
++              return f;
++
++      acm_log(0, "notice - generating acm_addr.cfg file\n");
++      if (!(f = popen("ib_acme -A", "r"))) {
++              acm_log(0, "ERROR - cannot generate acm_addr.cfg\n");
++              return NULL;
++      }
++      pclose(f);
++      return fopen(addr_file, "r");
++}
++
+ static int acm_assign_ep_names(struct acm_ep *ep)
+ {
+       FILE *faddr;
+@@ -2883,22 +2898,6 @@ static FILE *acm_open_log(void)
+       return f;
+ }
+ 
+-static FILE *acm_open_addr_file(void)
+-{
+-      FILE *f;
+-
+-      if ((f = fopen(addr_file, "r")))
+-              return f;
+-
+-      acm_log(0, "notice - generating acm_addr.cfg file\n");
+-      if (!(f = popen("ib_acme -A", "r"))) {
+-              acm_log(0, "ERROR - cannot generate acm_addr.cfg\n");
+-              return NULL;
+-      }
+-      pclose(f);
+-      return fopen(addr_file, "r");
+-}
+-
+ static int acm_open_lock_file(void)
+ {
+       int lock_fd;
+@@ -2952,9 +2951,7 @@ static void show_usage(char *program)
+ 
+ int CDECL_FUNC main(int argc, char **argv)
+ {
+-      struct ibv_device **ibdev;
+-      int dev_cnt;
+-      int op, i, daemon = 0;
++      int op, daemon = 0;
+ 
+       while ((op = getopt(argc, argv, "DA:O:")) != -1) {
+               switch (op) {