pop

diff --git a/meta b/meta
index f9c9b5e842a2dd6d9cc2c46f03cedd139c67a665..7340acdf6a5c4a0defed750693f8587c7b33c1c8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: c73fcd821ee2f9e068fa7a799b2fb4c95c2aec19
-Head: 3b1f7191c890140c64eb9972876b4e56955a65ca
+Previous: 70bbeafcf718091b8b87ce5e5fab2ab9eef1e683
+Head: 89e7b0588d4734cae4ef41c84bf88116a4e30649
 Applied:
+  addr_open: 89e7b0588d4734cae4ef41c84bf88116a4e30649
 Unapplied:
   autoaddr: 36281f18de15f2482e21ae1304f2e34e9ecf187d
-  addr_open: 5eb3d268fe35400cda8069a63415d51a035e5797
   open_dev: 3adebc52bfcb7835bf6c3f0885a611365e536386
   ep_active: f26357a61cf0f56bbc78d2043317b6e0ab37ac9c
   async_mc: c51c6e84981821b2541daba97cee9a29cd1d3709

diff --git a/patches/addr_open b/patches/addr_open
index b79007fdd766c9fe941ae8bab4f5721c854b544e..668976827013d1aabd2442070a173bda188bfdec 100644 (file)
--- a/patches/addr_open
+++ b/patches/addr_open
@@ -1,5 +1,5 @@
-Bottom: d65a2839777e9248477661e92509a1f24ef35537
-Top:    4ab29560f27d5a7097e5210fa3315e024bf134a3
+Bottom: a8e8aa49b3591176bc809c876eb5943ae719ce0d
+Top:    976ed279ef2e567aeaf48623bec61ec7adbc5bd7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-01-20 11:46:44 -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 0338e80..5f58cf0 100644
+index 1f3c470..38f41d2 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -203,7 +203,6 @@ static SOCKET listen_socket;
@@ -28,7 +28,7 @@ index 0338e80..5f58cf0 100644
  static lock_t log_lock;
  PER_THREAD char log_data[ACM_MAX_ADDRESS];
  
-@@ -2390,6 +2389,7 @@ err:
+@@ -2389,6 +2388,7 @@ err:
  
  static int acm_assign_ep_names(struct acm_ep *ep)
  {
@@ -36,7 +36,7 @@ index 0338e80..5f58cf0 100644
        char *dev_name;
        char s[120];
        char dev[32], addr[32], pkey_str[8];
-@@ -2402,7 +2402,11 @@ static int acm_assign_ep_names(struct acm_ep *ep)
+@@ -2401,7 +2401,11 @@ 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);
  
@@ -49,7 +49,7 @@ index 0338e80..5f58cf0 100644
        while (fgets(s, sizeof s, faddr)) {
                if (s[0] == '#')
                        continue;
-@@ -2446,6 +2450,7 @@ static int acm_assign_ep_names(struct acm_ep *ep)
+@@ -2445,6 +2449,7 @@ static int acm_assign_ep_names(struct acm_ep *ep)
                        }
                }
        }
@@ -57,7 +57,7 @@ index 0338e80..5f58cf0 100644
  
        return !index;
  }
-@@ -2974,11 +2979,6 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -2969,11 +2974,6 @@ int CDECL_FUNC main(int argc, char **argv)
        DListInit(&timeout_list);
        event_init(&timeout_event);
  
@@ -69,7 +69,7 @@ index 0338e80..5f58cf0 100644
        umad_init();
        ibdev = ibv_get_device_list(&dev_cnt);
        if (!ibdev) {
-@@ -2995,7 +2995,6 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -2990,7 +2990,6 @@ int CDECL_FUNC main(int argc, char **argv)
                acm_log(0, "ERROR - no active devices\n");
                return -1;
        }