tree 8d93e92d0f9fcf4866cab081c0ee323311a372c4
parent 8abac46fa67bbe197e50924e922b351a1a4e23a0
author Roland Dreier <[EMAIL PROTECTED]> Tue Apr 12 08:26:33 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:33 2005
[PATCH] IPoIB: fix static rate calculation
Correct and simplify calculation of static rate. We need to round up the
quotient of (local_rate - path_rate) / path_rate. To round up we add
(path_rate - 1) to the numerator, so the quotient simplifies to (local_rate -
1) / path_rate.
No idea how I came up with the old formula.
Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
ipoib_main.c | 7 +++----
ipoib_multicast.c | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
Index: drivers/infiniband/ulp/ipoib/ipoib_main.c
===================================================================
---
56a1bf46c1804ab89c5201aca17e51a1f8a32970/drivers/infiniband/ulp/ipoib/ipoib_main.c
(mode:100644 sha1:613f99744f458e63ec51dfca474ad69274dcbdc8)
+++
8d93e92d0f9fcf4866cab081c0ee323311a372c4/drivers/infiniband/ulp/ipoib/ipoib_main.c
(mode:100644 sha1:dc3d27c922d489d3c27f7208894237f64d7d58c8)
@@ -302,11 +302,10 @@
.sl = pathrec->sl,
.port_num = priv->port
};
+ int path_rate = ib_sa_rate_enum_to_int(pathrec->rate);
- if (ib_sa_rate_enum_to_int(pathrec->rate) > 0)
- av.static_rate = (2 * priv->local_rate -
- ib_sa_rate_enum_to_int(pathrec->rate)
- 1) /
- (priv->local_rate ? priv->local_rate : 1);
+ if (path_rate > 0 && priv->local_rate > path_rate)
+ av.static_rate = (priv->local_rate - 1) / path_rate;
ipoib_dbg(priv, "static_rate %d for local port %dX, path %dX\n",
av.static_rate, priv->local_rate,
Index: drivers/infiniband/ulp/ipoib/ipoib_multicast.c
===================================================================
---
56a1bf46c1804ab89c5201aca17e51a1f8a32970/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
(mode:100644 sha1:92cc168065fc6882462b32bb9edfc01bde141bfb)
+++
8d93e92d0f9fcf4866cab081c0ee323311a372c4/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
(mode:100644 sha1:8ab94c47f8d75cc43c9537c85ef543453372e47b)
@@ -258,13 +258,12 @@
.traffic_class = mcast->mcmember.traffic_class
}
};
+ int path_rate = ib_sa_rate_enum_to_int(mcast->mcmember.rate);
av.grh.dgid = mcast->mcmember.mgid;
- if (ib_sa_rate_enum_to_int(mcast->mcmember.rate) > 0)
- av.static_rate = (2 * priv->local_rate -
-
ib_sa_rate_enum_to_int(mcast->mcmember.rate) - 1) /
- (priv->local_rate ? priv->local_rate : 1);
+ if (path_rate > 0 && priv->local_rate > path_rate)
+ av.static_rate = (priv->local_rate - 1) / path_rate;
ipoib_dbg_mcast(priv, "static_rate %d for local port %dX,
mcmember %dX\n",
av.static_rate, priv->local_rate,
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
