refresh

diff --git a/meta b/meta
index bddd723c5b3fa5561a1d95e635379911ca44c766..586d10b686517f8ae13b5a7e5a5dfd7c2026e767 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: a199211308b6a34004e252f5b1b4189b43d72fb8
-Head: 80763bcb7aa9e9df3c903af177ae0f7039bf6eba
+Previous: d712b1b4998a696debede8f957f0013bef8bd2f2
+Head: 182179552116698d6624f7bcb2d2cd48dc3bccce
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
@@ -8,8 +8,7 @@ Applied:
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
   lid: d0bffbd0765be6a31be97aee1a336681c49e4d99
-  def-route: 71758fdba335d826648ae92d80a5ea53d3d076ee
-  refresh-temp: 80763bcb7aa9e9df3c903af177ae0f7039bf6eba
+  def-route: 182179552116698d6624f7bcb2d2cd48dc3bccce
 Unapplied:
   daemonize: 94e0f52806e52e9a441f25cb3bc30bebacd2e1d1
   rel-1.0.6: 5028b5c72ed397df42c3ac53263914025f6c2d86

diff --git a/patches/def-route b/patches/def-route
index 314a086aca127e4e24d07e9ea6cbd92cbb16bbea..8e726ff4d482b24136211d182d1435521f2d0858 100644 (file)
--- a/patches/def-route
+++ b/patches/def-route
@@ -1,15 +1,29 @@
 Bottom: aa257fb159401d03e22d6da8501895fe34e69bed
-Top:    aa257fb159401d03e22d6da8501895fe34e69bed
+Top:    76bbe9d40be7ab8454df1b55243a5ce561520165
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-04-06 08:12:02 -0700
 
 ibacm: Set default route resolution to SA
 
 SA resolution works in more environments than the ACM protocol.
+SA is the default protocol for the ibacm_opts.cfg file, but if
+that file is not available, the ibacm service defaults to ACM.
 
 Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index 5041b1c..b47ee8a 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -211,7 +211,7 @@ static char log_file[128] = "/var/log/ibacm.log";
+ static int log_level = 0;
+ static char lock_file[128] = "/var/lock/ibacm.pid";
+ static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
+-static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM;
++static enum acm_route_prot route_prot = ACM_ROUTE_PROT_SA;
+ static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;
+ static short server_port = 6125;
+ static int timeout = 2000;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 0762aac..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: aa257fb159401d03e22d6da8501895fe34e69bed
-Top:    76bbe9d40be7ab8454df1b55243a5ce561520165
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-06 08:13:45 -0700
-
-Refresh of def-route
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 5041b1c..b47ee8a 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -211,7 +211,7 @@ static char log_file[128] = "/var/log/ibacm.log";
- static int log_level = 0;
- static char lock_file[128] = "/var/lock/ibacm.pid";
- static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
--static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM;
-+static enum acm_route_prot route_prot = ACM_ROUTE_PROT_SA;
- static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;
- static short server_port = 6125;
- static int timeout = 2000;