please pull infiniband.git
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This will get two small fixes for 2.6.24:
Jack Morgenstein (1):
IPoIB: Fix oops if xmit is called when priv->broadcast is NULL
Joachim Fenkes (1):
IB/ehca: Fix static rate if path faster than link
drivers/infiniband/hw/ehca/ehca_av.c | 8 ++++++-- drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/infiniband/hw/ehca/ehca_av.c +6 -2
@@ -76,8 +76,12 @@ int ehca_calc_ipd(struct ehca_shca *shca, int port, link =ib_width_enum_to_int (pa.active_width) * pa.active_speed; -/* IPD = round((link / path) - 1) */ - *ipd = ((link + (path >>1 )) / path) -1 ; +if (path >= link) +/* no need to throttle if path faster than link */ + *ipd =0 ; +else +/* IPD = round((link / path) - 1) */ + *ipd = ((link + (path >>1 )) / path) -1 ;return 0 ; }
drivers/infiniband/ulp/ipoib/ipoib_main.c +3 -0
@@ -460,6 +460,9 @@ static struct ipoib_path *path_rec_create(struct net_device *dev, void *gid)struct ipoib_dev_priv *priv =netdev_priv (dev);struct ipoib_path *path; +if (!priv->broadcast) +return NULL ; + path =kzalloc (sizeof *path,GFP_ATOMIC );if (!path)return NULL ;