refresh (create temporary patch)

diff --git a/meta b/meta
index 250d4e644c31237157d8c4e2dd5edecfafc8288b..e38dbd328c016a7d64758d82cd3af11fb433411f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 49de8895c86a52e98591cbc3f5864e4b8250e302
-Head: dc6e19b5dd8442d466fa4afc89e14604d80caa3e
+Previous: e12ee6d9f8c87c6b99275a07802e06bfece922c7
+Head: 02340c54bc1b203b30060004989b848b01e58d1a
 Applied:
   subnet-timeout: dc6e19b5dd8442d466fa4afc89e14604d80caa3e
+  refresh-temp: 02340c54bc1b203b30060004989b848b01e58d1a
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..7918873
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,23 @@
+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)