refresh

diff --git a/meta b/meta
index 06a3e1b010f22d4c4e0da41b3412aa8209b2f30c..c1fd56734662fa2665d7d80e7b3ae3b1459f7cd1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 419ed1a2fe69f76cb778402d56b16e589dee69ca
-Head: 4eb3c5ff71c633cf07fcd0469a9b4e5e9ad9a030
+Previous: 78b1a18dc00a2625c3668501d6b9ce905b5adfe8
+Head: 371506a83d025ba296459fb6b0be2e04ccb82418
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -11,8 +11,7 @@ Applied:
   locking: 558e5577364aec3531c54b28def6e16f0c926524
   verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
-  no_active: 259c0f1ed231594250845559a8a65bb37de06090
-  refresh-temp: 4eb3c5ff71c633cf07fcd0469a9b4e5e9ad9a030
+  no_active: 371506a83d025ba296459fb6b0be2e04ccb82418
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/no_active b/patches/no_active
index 595ef0956fd14164d23f1174a1b40d474edd2c4d..1300a0c74e0c01f6f680fc9af3f4b75e5c672cc7 100644 (file)
--- a/patches/no_active
+++ b/patches/no_active
@@ -1,5 +1,5 @@
 Bottom: 5e7b11ab34ad911d8a6551337d36c51be1b092b4
-Top:    5e7b11ab34ad911d8a6551337d36c51be1b092b4
+Top:    fc046737101d8f0b0b7e747265c57fec539e34e4
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 11:06:47 -0800
 
@@ -13,4 +13,18 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index 9ff81c4..fce0fc9 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -2825,6 +2825,10 @@ int CDECL_FUNC main(int argc, char **argv)
+               acm_open_dev(ibdev[i]);
+ 
+       ibv_free_device_list(ibdev);
++      if (DListEmpty(&dev_list)) {
++              acm_log(0, "ERROR - no active devices\n");
++              return -1;
++      }
+ 
+       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 3c19bfd..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 5e7b11ab34ad911d8a6551337d36c51be1b092b4
-Top:    fc046737101d8f0b0b7e747265c57fec539e34e4
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-06 11:07:22 -0800
-
-Refresh of no_active
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 9ff81c4..fce0fc9 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2825,6 +2825,10 @@ int CDECL_FUNC main(int argc, char **argv)
-               acm_open_dev(ibdev[i]);
- 
-       ibv_free_device_list(ibdev);
-+      if (DListEmpty(&dev_list)) {
-+              acm_log(0, "ERROR - no active devices\n");
-+              return -1;
-+      }
- 
-       acm_log(1, "initiating multicast joins\n");
-       acm_join_groups();