From 8f9c28c6e8f0c99a67ba23d358aa4a7de84960bc Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Sat, 16 Apr 2005 15:26:06 -0700 Subject: [PATCH] --- yaml --- r: 155 b: refs/heads/master c: e6ded99cbbbfef2cef537d717ad61d2f77f4dfd6 h: refs/heads/master i: 153: 05dcbe67e7cdfc15743ea3a1eb592d57e8d93a7a 151: bb850822c6c59cb915ba4457ca6ab33e1e295a85 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c | 7 +++---- trunk/drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 7 +++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a01f6697975a..19bd12f052aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62241eb497721be7640e5d9330e60f4a88a4db46 +refs/heads/master: e6ded99cbbbfef2cef537d717ad61d2f77f4dfd6 diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c index 5a3b5c6a4494..8d35475a1d56 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -302,11 +302,10 @@ static void path_rec_completion(int status, .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, diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index f46932dc81c9..70208c3d21e2 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_multicast.c @@ -258,13 +258,12 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast, .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,