]> git.openfabrics.org - ~shefty/ibacm.git/commitdiff
refresh (create temporary patch)
authorSean Hefty <sean.hefty@intel.com>
Mon, 6 Dec 2010 19:31:09 +0000 (11:31 -0800)
committerSean Hefty <sean.hefty@intel.com>
Mon, 6 Dec 2010 19:31:09 +0000 (11:31 -0800)
meta
patches/refresh-temp [new file with mode: 0644]

diff --git a/meta b/meta
index 86eff88e76a1923c1a4087c1a2b3fcae0ccbdafb..f55cb9161375db90960e6fe4685ad9b77285bec7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 86a0d6f3dac409470c1f5b9e4e25b718e48c5ea5
-Head: ba931a40530d6840893b686a6ed817ff9c4b15af
+Previous: 8cbf81c009070546058e3eb3a714707af3d7dcc2
+Head: a45ac393de28b1e7a24a389f8054ad7d6d46d8dc
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -12,6 +12,7 @@ Applied:
   verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
   no_addr: ba931a40530d6840893b686a6ed817ff9c4b15af
+  refresh-temp: a45ac393de28b1e7a24a389f8054ad7d6d46d8dc
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..caee89a
--- /dev/null
@@ -0,0 +1,26 @@
+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();