From 6a03c6b81ba716f930b9d1fa41ed6f5ef277c29f Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 4 Jun 2012 12:17:56 -0700 Subject: [PATCH] commit --- meta | 3 +-- patches/subnet-timeout | 29 ----------------------------- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 patches/subnet-timeout diff --git a/meta b/meta index 45fa599..ba3e320 100644 --- a/meta +++ b/meta @@ -1,8 +1,7 @@ Version: 1 -Previous: f7dce6969254f8da6004d9a0487c725446ab7adf +Previous: ca6dbfbce9fe73a99b9e2245dae1f3d752823de0 Head: a73e2363868153e9a82e2d667a3a3e9fd903b9c9 Applied: - subnet-timeout: ac94bb084f01f868389017d3940d4b74190d9387 acme-src: a2f73a11cb993f084a923693c1ffb48239c84a78 acm-nosrc: a73e2363868153e9a82e2d667a3a3e9fd903b9c9 Unapplied: diff --git a/patches/subnet-timeout b/patches/subnet-timeout deleted file mode 100644 index 0af63ec..0000000 --- a/patches/subnet-timeout +++ /dev/null @@ -1,29 +0,0 @@ -Bottom: a971239f22e61016c756021263852a291c5f5953 -Top: 81c354afb6eda33cef711513651667706fe2af21 -Author: Hal Rosenstock -Date: 2012-05-31 15:35:41 -0700 - -ibacm: Avoid negative shift for subnet timeout - -Otherwise resulting port subnet timeout may be too large. - -Signed-off-by: Hal Rosenstock -Signed-off-by: Sean Hefty - - ---- - -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.46.0