From 279cf0407cdca4f28de5dad93be66c2b28417341 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 31 May 2012 16:19:06 -0700
Subject: [PATCH] refresh

---
 meta                   |  7 +++----
 patches/refresh-temp   | 23 -----------------------
 patches/subnet-timeout | 17 +++++++++++++++--
 3 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index e38dbd3..5e1f10e 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: e12ee6d9f8c87c6b99275a07802e06bfece922c7
-Head: 02340c54bc1b203b30060004989b848b01e58d1a
+Previous: 03d02b359c1add5e6f732f04ec7b6382fb0bfec6
+Head: 45849aa11328876a4a96e85a66ad4b06c3af059a
 Applied:
-  subnet-timeout: dc6e19b5dd8442d466fa4afc89e14604d80caa3e
-  refresh-temp: 02340c54bc1b203b30060004989b848b01e58d1a
+  subnet-timeout: 45849aa11328876a4a96e85a66ad4b06c3af059a
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 7918873..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: a971239f22e61016c756021263852a291c5f5953
-Top:    81c354afb6eda33cef711513651667706fe2af21
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-31 16:19:06 -0700
-
-Refresh of subnet-timeout
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 376f294..c940df3 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2795,7 +2795,8 @@ static void acm_port_up(struct acm_port *port)
- 
- 	port->mtu = attr.active_mtu;
- 	port->rate = acm_get_rate(attr.active_width, attr.active_speed);
--	port->subnet_timeout = 1 << (attr.subnet_timeout - 8);
-+	if (attr.subnet_timeout >= 8)
-+		port->subnet_timeout = 1 << (attr.subnet_timeout - 8);
- 	for (port->gid_cnt = 0;; port->gid_cnt++) {
- 		ret = ibv_query_gid(port->dev->verbs, port->port_num, port->gid_cnt, &gid);
- 		if (ret || !gid.global.interface_id)
diff --git a/patches/subnet-timeout b/patches/subnet-timeout
index 8dc06fd..edc49fd 100644
--- a/patches/subnet-timeout
+++ b/patches/subnet-timeout
@@ -1,5 +1,5 @@
 Bottom: a971239f22e61016c756021263852a291c5f5953
-Top:    a971239f22e61016c756021263852a291c5f5953
+Top:    81c354afb6eda33cef711513651667706fe2af21
 Author: Hal Rosenstock <hal@mellanox.com>
 Date:   2012-05-31 15:35:41 -0700
 
@@ -11,4 +11,17 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index 376f294..c940df3 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -2795,7 +2795,8 @@ static void acm_port_up(struct acm_port *port)
+ 
+ 	port->mtu = attr.active_mtu;
+ 	port->rate = acm_get_rate(attr.active_width, attr.active_speed);
+-	port->subnet_timeout = 1 << (attr.subnet_timeout - 8);
++	if (attr.subnet_timeout >= 8)
++		port->subnet_timeout = 1 << (attr.subnet_timeout - 8);
+ 	for (port->gid_cnt = 0;; port->gid_cnt++) {
+ 		ret = ibv_query_gid(port->dev->verbs, port->port_num, port->gid_cnt, &gid);
+ 		if (ret || !gid.global.interface_id)
-- 
2.41.0