refresh

diff --git a/meta b/meta
index 6d0f2fa90d535a289b3299d44a5105d786cfd39f..6f6bac2e606a4160182fb2e250c5a1d66ae4a764 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 223dd9fa5e999d72d4ffde7f1c38b1a51eade1c3
-Head: 2d68428f614d8802042d666fde6f19290995c958
+Previous: 0590c9ceea88bd0feda99ec49aab684794f63667
+Head: b12c64a6b01a0f2ba5bda34413f44676ae09648d
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
   loop: 1e219f58eafc1fb4f035e67e90d88b5b69d44c16
   fix-text: 6d9535384c392e24b6820e6de50112b39883fe56
-  dist-cfg: 1e9fcfee450ca11bdb5cbcab7e4024f14deccf31
-  refresh-temp: 2d68428f614d8802042d666fde6f19290995c958
+  dist-cfg: b12c64a6b01a0f2ba5bda34413f44676ae09648d
 Unapplied:
   lower_retries: d33305b5848518e4616dd26f2827c580fd5034f6
   1.0.4: db24cd6696165aaa0710030188e77be4d6b4cbfd

diff --git a/patches/dist-cfg b/patches/dist-cfg
index 4524fa7e291034bac36bb850151a9d68f37ca801..0d97da9620002b1c47a58c5f1928f07e96113764 100644 (file)
--- a/patches/dist-cfg
+++ b/patches/dist-cfg
@@ -1,5 +1,5 @@
 Bottom: 2ade29ce3f23fc9eb785f9810ca0b437d7a23a8c
-Top:    373094ca753531b7dc76712d64a4a7efec7212b5
+Top:    a0ecb1b922c5017e5c328ccc5c56928a340a4c65
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-30 19:31:04 -0800
 
@@ -27,3 +27,46 @@ index f443091..957b016 100644
  
  dist-hook: ibacm.spec
        cp ibacm.spec $(distdir)
+diff --git a/acm_opts.cfg b/acm_opts.cfg
+index a9319f2..372cd7b 100644
+--- a/acm_opts.cfg
++++ b/acm_opts.cfg
+@@ -67,7 +67,28 @@ timeout 2000
+ # Number of times that the ACM service will retry a request.  This affects\r
+ # both ACM multicast messages and and IB SA messages.\r
+ \r
+-retries 15\r
++retries 2\r
++\r
++# resolve_depth:\r
++# Specifies the maximum number of outstanding requests that can be in\r
++# progress simultaneously.  A larger resolve depth allows for greater\r
++# parallelism, but increases system resource usage and subnet load.\r
++# If the number of pending requests is greater than the resolve_depth,\r
++# the additional requests will automatically be queued until some of\r
++# the previous requests complete.\r
++\r
++resolve_depth 1\r
++\r
++# sa_depth:\r
++# Specifies the maximum number of outstanding requests to the SA that\r
++# can be in progress simultaneously.  A larger SA depth allows for greater\r
++# parallelism, but increases system resource usage and SA load.\r
++# If the number of pending SA requests is greater than the sa_depth,\r
++# the additional requests will automatically be queued until some of\r
++# the previous requests complete.  The number of outstanding SA requests\r
++# is separate from the specified resolve_depth.\r
++\r
++sa_depth 1\r
+ \r
+ # send_depth:\r
+ # Specifies the maximum number of outstanding requests that can be in\r
+@@ -77,7 +98,7 @@ retries 15
+ # the additional requests will automatically be queued until some of\r
+ # the previous requests complete.\r
+ \r
+-send_depth 8\r
++send_depth 1\r
+ \r
+ # recv_depth:\r
+ # Specifies the number of buffers allocated and ready to receive remote

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2ce4bb9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,52 +0,0 @@
-Bottom: 373094ca753531b7dc76712d64a4a7efec7212b5
-Top:    a0ecb1b922c5017e5c328ccc5c56928a340a4c65
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-01 14:55:58 -0800
-
-Refresh of dist-cfg
-
----
-
-diff --git a/acm_opts.cfg b/acm_opts.cfg
-index a9319f2..372cd7b 100644
---- a/acm_opts.cfg
-+++ b/acm_opts.cfg
-@@ -67,7 +67,28 @@ timeout 2000
- # Number of times that the ACM service will retry a request.  This affects\r
- # both ACM multicast messages and and IB SA messages.\r
- \r
--retries 15\r
-+retries 2\r
-+\r
-+# resolve_depth:\r
-+# Specifies the maximum number of outstanding requests that can be in\r
-+# progress simultaneously.  A larger resolve depth allows for greater\r
-+# parallelism, but increases system resource usage and subnet load.\r
-+# If the number of pending requests is greater than the resolve_depth,\r
-+# the additional requests will automatically be queued until some of\r
-+# the previous requests complete.\r
-+\r
-+resolve_depth 1\r
-+\r
-+# sa_depth:\r
-+# Specifies the maximum number of outstanding requests to the SA that\r
-+# can be in progress simultaneously.  A larger SA depth allows for greater\r
-+# parallelism, but increases system resource usage and SA load.\r
-+# If the number of pending SA requests is greater than the sa_depth,\r
-+# the additional requests will automatically be queued until some of\r
-+# the previous requests complete.  The number of outstanding SA requests\r
-+# is separate from the specified resolve_depth.\r
-+\r
-+sa_depth 1\r
- \r
- # send_depth:\r
- # Specifies the maximum number of outstanding requests that can be in\r
-@@ -77,7 +98,7 @@ retries 15
- # the additional requests will automatically be queued until some of\r
- # the previous requests complete.\r
- \r
--send_depth 8\r
-+send_depth 1\r
- \r
- # recv_depth:\r
- # Specifies the number of buffers allocated and ready to receive remote