tree 44ef73e8f9ac7bdfc71ff3286e6b2715aafbbd9d
parent 62241eb497721be7640e5d9330e60f4a88a4db46
author Roland Dreier <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:26:06 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:26:06 -0700
[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]>
infiniband/ulp/ipoib/ipoib_main.c | 7 +++----
infiniband/ulp/ipoib/ipoib_multicast.c | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
Index: drivers/infiniband/ulp/ipoib/ipoib_main.c
===================================================================
---
5bf7d25db72b20d0781190c0e3c72cea94a2ecb3/drivers/infiniband/ulp/ipoib/ipoib_main.c
(mode:100644 sha1:5a3b5c6a4494027932f67f6087257dc60018841b)
+++
44ef73e8f9ac7bdfc71ff3286e6b2715aafbbd9d/drivers/infiniband/ulp/ipoib/ipoib_main.c
(mode:100644 sha1:8d35475a1d568b9cee517fcc7f25432a6fea819c)
@@ -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
===================================================================
---
5bf7d25db72b20d0781190c0e3c72cea94a2ecb3/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
(mode:100644 sha1:f46932dc81c94385550e5d4534c332a9b0cb0b51)
+++
44ef73e8f9ac7bdfc71ff3286e6b2715aafbbd9d/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
(mode:100644 sha1:70208c3d21e28d415a8f9a82f886e62b64c4590d)
@@ -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
