refresh

diff --git a/meta b/meta
index d9ea5e0394a26e63f370e94bdb87c5826fe966f5..f0f0710a8c812d067719329d168276af39cc91d5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 702ec0c9e1515cf2db06bd40a20bac5d1d732171
-Head: a4dff4e684b89b11d11269ba28d9247a0683f052
+Previous: 67a4ba50051da18d0ad7276275e7813a18fc8552
+Head: 77fc3b61749ca5785e28bf487a5df84189466ecb
 Applied:
   addr_open: 1fd2bfd86e2e2fe78f9d5d6d39aa5502938923f0
   open_dev: 4687a6571146acd8d9a1553a96e2e4f7e8318761
-  ep_active: fa874efdbe4fe03a174f364aef655e3c184df8b4
-  refresh-temp: a4dff4e684b89b11d11269ba28d9247a0683f052
+  ep_active: 77fc3b61749ca5785e28bf487a5df84189466ecb
 Unapplied:
   autoaddr: 36281f18de15f2482e21ae1304f2e34e9ecf187d
   async_mc: c51c6e84981821b2541daba97cee9a29cd1d3709

diff --git a/patches/ep_active b/patches/ep_active
index f25b2fa97c9815daf1f0caf95e6f2526953d87a8..401b3da66d5342f47106ee6a7c3a3969af3d3830 100644 (file)
--- a/patches/ep_active
+++ b/patches/ep_active
@@ -1,5 +1,5 @@
 Bottom: fb1d0cc95bf413473d6098cbb67824845146864e
-Top:    49af70598cfc4c3312b698b4acd973641bf76f48
+Top:    74c254a77501b64753142f1e530134e5ffa86d53
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-01-20 17:06:28 -0800
 
@@ -24,7 +24,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index f21f702..bc080f2 100644
+index f21f702..10680f8 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -294,15 +294,22 @@ static int acm_compare_dest(const void *dest1, const void *dest2)
@@ -276,7 +276,7 @@ index f21f702..bc080f2 100644
                if (!ret) {
                        DListInsertHead(&ep->entry, &port->ep_list);
                } else {
-@@ -2619,103 +2664,70 @@ static void acm_activate_port(struct acm_port *port)
+@@ -2619,103 +2664,71 @@ static void acm_activate_port(struct acm_port *port)
                }
        }
  
@@ -335,6 +335,7 @@ index f21f702..bc080f2 100644
 -              goto err;
 -      }
 -
++      acm_log(1, "started\n");
        for (i = 0; i < dev->port_cnt; i++) {
 -              acm_log(2, "checking port %d\n", dev->port[i].port_num);
 -              if (dev->port[i].state == IBV_PORT_ACTIVE)
@@ -425,7 +426,7 @@ index f21f702..bc080f2 100644
  }
  
  static void acm_open_dev(struct ibv_device *ibdev)
-@@ -2748,25 +2760,59 @@ static void acm_open_dev(struct ibv_device *ibdev)
+@@ -2748,25 +2761,59 @@ static void acm_open_dev(struct ibv_device *ibdev)
        dev->guid = ibv_get_device_guid(ibdev);
        dev->port_cnt = attr.phys_port_cnt;
  
@@ -492,7 +493,7 @@ index f21f702..bc080f2 100644
  static void acm_set_options(void)
  {
        FILE *f;
-@@ -2852,22 +2898,6 @@ static FILE *acm_open_log(void)
+@@ -2852,22 +2899,6 @@ static FILE *acm_open_log(void)
        return f;
  }
  
@@ -515,7 +516,7 @@ index f21f702..bc080f2 100644
  static int acm_open_lock_file(void)
  {
        int lock_fd;
-@@ -2921,9 +2951,7 @@ static void show_usage(char *program)
+@@ -2921,9 +2952,7 @@ static void show_usage(char *program)
  
  int CDECL_FUNC main(int argc, char **argv)
  {
@@ -526,7 +527,7 @@ index f21f702..bc080f2 100644
  
        while ((op = getopt(argc, argv, "DA:O:")) != -1) {
                switch (op) {
-@@ -2963,27 +2991,13 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -2963,27 +2992,13 @@ int CDECL_FUNC main(int argc, char **argv)
        DListInit(&dev_list);
        DListInit(&timeout_list);
        event_init(&timeout_event);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2c6ca3d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 49af70598cfc4c3312b698b4acd973641bf76f48
-Top:    74c254a77501b64753142f1e530134e5ffa86d53
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-02-10 11:59:48 -0800
-
-Refresh of ep_active
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index bc080f2..10680f8 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2681,6 +2681,7 @@ static void CDECL_FUNC acm_event_handler(void *context)
-       struct acm_device *dev = (struct acm_device *) context;
-       int i;
- 
-+      acm_log(1, "started\n");
-       for (i = 0; i < dev->port_cnt; i++) {
-               acm_port_up(&dev->port[i]);
-       }