From 7f4018ebb286757c16583d964b8065be165c71ac Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 27 Jun 2013 18:20:39 -0700 Subject: [PATCH] delete --- meta | 3 +- patches/ibacm_opts-cfg-sync-default-op | 74 -------------------------- 2 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 patches/ibacm_opts-cfg-sync-default-op diff --git a/meta b/meta index 360a86c..46f754a 100644 --- a/meta +++ b/meta @@ -1,12 +1,11 @@ Version: 1 -Previous: 5bb8c8904396e1a0834cdcc86065c99d2bbc0afa +Previous: 30e5ca12ee457f1997d6c71cf92022b18d4ce7e5 Head: df6ba3b66ba1c626913faa98316ccab8585769b9 Applied: rmcfg: 84d811fcdc9f212f243f82594d613b68aea367c4 acm_notes-txt-change-dos-forma: d76f683c246786876219d6db213643600734d894 senddep: df6ba3b66ba1c626913faa98316ccab8585769b9 Unapplied: - ibacm_opts-cfg-sync-default-op: 2770d56ecb9892eb773fcf76f782ba79247b599e more-cosmetic-changes-for-cons: 33578436d1a3dcfebcdb00c2ec6235867f396fd3 man-change-dos-formatting-to-u: 9d2e0a48650526702ef5a94dc829158f313485ef update-ib_acme-1-and-ibacm-1-m: d6b394d32f0136bd7338cd6aa075adf9e75eca0e diff --git a/patches/ibacm_opts-cfg-sync-default-op b/patches/ibacm_opts-cfg-sync-default-op deleted file mode 100644 index 1d9fcbf..0000000 --- a/patches/ibacm_opts-cfg-sync-default-op +++ /dev/null @@ -1,74 +0,0 @@ -Bottom: 307355718400a73b5b5aa7627e06e550b8806861 -Top: c682b6b4f22a77a1070de8ee86938d4917128e15 -Author: Hal Rosenstock -Date: 2013-06-15 15:46:29 +0300 - -ibacm_opts.cfg: Sync default options file with generated output - -from ib_acme -D . -O - -Signed-off-by: Hal Rosenstock -Signed-off-by: Sean Hefty - - ---- - -diff --git a/ibacm_opts.cfg b/ibacm_opts.cfg -index 58069b8..cc8746f 100644 ---- a/ibacm_opts.cfg -+++ b/ibacm_opts.cfg -@@ -30,7 +30,7 @@ log_level 0 - # Specifies the location of the ACM lock file used to ensure that only a - # single instance of ACM is running. - --lock_file /var/lock/ibacm.pid -+lock_file /var/run/ibacm.pid - - # addr_prot: - # Default resolution protocol to resolve IP addresses into IB GIDs. -@@ -39,6 +39,13 @@ lock_file /var/lock/ibacm.pid - - addr_prot acm - -+# addr_timeout: -+# Number of minutes to maintain IP address to GID mapping before -+# repeating address resolution. A value of -1 indicates that the -+# mapping will not time out. -+# 1 hour = 60, 1 day = 1440, 1 week = 10080, 1 month ~ 43200 -+addr_timeout 1440 -+ - # route_prot: - # Default resolution protocol to resolve IB routing information. - # Supported protocols are: -@@ -47,6 +54,14 @@ addr_prot acm - - route_prot sa - -+# route_timeout: -+# Number of minutes to maintain IB routing information before -+# repeating route resolution. A value of -1 indicates that the -+# mapping will not time out. However, the route will -+# automatically time out when the address times out. -+# 1 hour = 60, 1 day = 1440, 1 week = 10080, 1 month ~ 43200 -+route_timeout -1 -+ - # loopback_prot: - # Address and route resolution protocol to resolve local addresses - # Supported protocols are: -@@ -97,12 +112,11 @@ resolve_depth 1 - sa_depth 1 - - # send_depth: --# Specifies the maximum number of outstanding requests that can be in --# progress simultaneously. A larger send depth allows for greater --# parallelism, but increases system resource usage and subnet load. --# If the number of pending requests is greater than the send_depth, --# the additional requests will automatically be queued until some of --# the previous requests complete. -+# Specifies the number of outstanding send operations that can -+# be in progress simultaneously. A larger send depth consumes -+# more system resources, but increases subnet load. The send_depth -+# is in addition to resolve_depth and sa_depth, and limits the -+# transfer of responses. - - send_depth 1 -- 2.46.0