refresh

diff --git a/meta b/meta
index f55cb9161375db90960e6fe4685ad9b77285bec7..5ee916a9fc2cb5b6c301d6c1c2425beb8fc69c7f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 8cbf81c009070546058e3eb3a714707af3d7dcc2
-Head: a45ac393de28b1e7a24a389f8054ad7d6d46d8dc
+Previous: e885ffa03668cba90c70904389dd411a8a16e88e
+Head: e069cf53cf858b5d0fc09b98e0b1dac3460ca877
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -11,8 +11,7 @@ Applied:
   locking: 558e5577364aec3531c54b28def6e16f0c926524
   verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
-  no_addr: ba931a40530d6840893b686a6ed817ff9c4b15af
-  refresh-temp: a45ac393de28b1e7a24a389f8054ad7d6d46d8dc
+  no_addr: e069cf53cf858b5d0fc09b98e0b1dac3460ca877
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/no_addr b/patches/no_addr
index f72b22b5916c23245bbb98f8222ad5243347fd37..683ead9cdc883fdda2379f95240eaf285878d4ba 100644 (file)
--- a/patches/no_addr
+++ b/patches/no_addr
@@ -1,5 +1,5 @@
 Bottom: 5e7b11ab34ad911d8a6551337d36c51be1b092b4
-Top:    a307944fa3171b48a0b7c8ad9cb0218ce45d24c2
+Top:    1efcf9e821c180f96719436b53c1a8345c5d6a78
 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..14cbfd6 100644
+index 9ff81c4..3285473 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -203,6 +203,7 @@ static SOCKET listen_socket;
@@ -88,11 +88,11 @@ index 9ff81c4..14cbfd6 100644
                acm_open_dev(ibdev[i]);
  
        ibv_free_device_list(ibdev);
-+      fclose(faddr);
 +      if (DListEmpty(&dev_list)) {
 +              acm_log(0, "ERROR - no active devices\n");
 +              return -1;
 +      }
++      fclose(faddr);
  
        acm_log(1, "initiating multicast joins\n");
        acm_join_groups();

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index caee89a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,26 +0,0 @@
-Bottom: a307944fa3171b48a0b7c8ad9cb0218ce45d24c2
-Top:    1efcf9e821c180f96719436b53c1a8345c5d6a78
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-06 11:31:09 -0800
-
-Refresh of no_addr
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 14cbfd6..3285473 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2842,11 +2842,11 @@ int CDECL_FUNC main(int argc, char **argv)
-               acm_open_dev(ibdev[i]);
- 
-       ibv_free_device_list(ibdev);
--      fclose(faddr);
-       if (DListEmpty(&dev_list)) {
-               acm_log(0, "ERROR - no active devices\n");
-               return -1;
-       }
-+      fclose(faddr);
- 
-       acm_log(1, "initiating multicast joins\n");
-       acm_join_groups();