pop

diff --git a/meta b/meta
index 9596772fabc30cbaa9468c335bb9611a365a8db3..af97f5d1a7e2a8a746de8c35b73891cfb3276c60 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: 595a7905a4bbdaf6985c57e0c15191c2c628a828
-Head: 1fd2bfd86e2e2fe78f9d5d6d39aa5502938923f0
+Previous: 0a0c8983fb43449d65d039c20df6d6bf0c7b5f42
+Head: 4687a6571146acd8d9a1553a96e2e4f7e8318761
 Applied:
   addr_open: 1fd2bfd86e2e2fe78f9d5d6d39aa5502938923f0
+  open_dev: 4687a6571146acd8d9a1553a96e2e4f7e8318761
 Unapplied:
   autoaddr: 36281f18de15f2482e21ae1304f2e34e9ecf187d
-  open_dev: 3adebc52bfcb7835bf6c3f0885a611365e536386
   ep_active: f26357a61cf0f56bbc78d2043317b6e0ab37ac9c
   async_mc: c51c6e84981821b2541daba97cee9a29cd1d3709
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/open_dev b/patches/open_dev
index 711ef813662b78e4acdc88570c723635de71f426..5431a5b1261ebca4d597a2949998fb11e5229a01 100644 (file)
--- a/patches/open_dev
+++ b/patches/open_dev
@@ -1,5 +1,5 @@
-Bottom: 4ab29560f27d5a7097e5210fa3315e024bf134a3
-Top:    b9b25b60f3a7d69a05d63b0462a5835ba8da08d3
+Bottom: 976ed279ef2e567aeaf48623bec61ec7adbc5bd7
+Top:    fb1d0cc95bf413473d6098cbb67824845146864e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-01-20 13:26:26 -0800
 
@@ -16,7 +16,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 5f58cf0..cacd469 100644
+index 38f41d2..f21f702 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -123,7 +123,6 @@ struct acm_device
@@ -27,7 +27,7 @@ index 5f58cf0..cacd469 100644
        int                     port_cnt;
        struct acm_port         port[0];
  };
-@@ -2647,7 +2646,6 @@ err2:
+@@ -2646,7 +2645,6 @@ err2:
        ibv_destroy_ah(port->sa_dest.ah);
  err1:
        port->state = IBV_PORT_NOP;
@@ -35,7 +35,7 @@ index 5f58cf0..cacd469 100644
  }
  
  static int acm_activate_dev(struct acm_device *dev)
-@@ -2662,7 +2660,7 @@ static int acm_activate_dev(struct acm_device *dev)
+@@ -2661,7 +2659,7 @@ static int acm_activate_dev(struct acm_device *dev)
        dev->channel = ibv_create_comp_channel(dev->verbs);
        if (!dev->channel) {
                acm_log(0, "ERROR - unable to create comp channel\n");
@@ -44,7 +44,7 @@ index 5f58cf0..cacd469 100644
        }
  
        for (i = 0; i < dev->port_cnt; i++) {
-@@ -2671,16 +2669,11 @@ static int acm_activate_dev(struct acm_device *dev)
+@@ -2670,16 +2668,11 @@ static int acm_activate_dev(struct acm_device *dev)
                        acm_activate_port(&dev->port[i]);
        }
  
@@ -62,7 +62,7 @@ index 5f58cf0..cacd469 100644
        ibv_dealloc_pd(dev->pd);
        return -1;
  }
-@@ -2724,9 +2717,6 @@ static void acm_init_port(struct acm_port *port)
+@@ -2723,9 +2716,6 @@ static void acm_init_port(struct acm_port *port)
        port->sa_dest.av.sl = attr.sm_sl;
        port->sa_dest.av.port_num = port->port_num;
        port->sa_dest.remote_qpn = 1;
@@ -72,7 +72,7 @@ index 5f58cf0..cacd469 100644
  }
  
  static void acm_open_dev(struct ibv_device *ibdev)
-@@ -2765,10 +2755,10 @@ static void acm_open_dev(struct ibv_device *ibdev)
+@@ -2764,10 +2754,10 @@ static void acm_open_dev(struct ibv_device *ibdev)
                acm_init_port(&dev->port[i]);
        }
  
@@ -85,7 +85,7 @@ index 5f58cf0..cacd469 100644
        DListInsertHead(&dev->entry, &dev_list);
        return;
  
-@@ -2992,7 +2982,7 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -2987,7 +2977,7 @@ int CDECL_FUNC main(int argc, char **argv)
  
        ibv_free_device_list(ibdev);
        if (DListEmpty(&dev_list)) {