Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ehca: Fix static rate if path faster than link
  IPoIB: Fix oops if xmit is called when priv->broadcast is NULL

2 files changed, 9 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_av.c b/drivers/infiniband/hw/ehca/ehca_av.c
index 453eb995c1d4..f7782c882ab4 100644
--- a/drivers/infiniband/hw/ehca/ehca_av.c
+++ b/drivers/infiniband/hw/ehca/ehca_av.c
@@ -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;
 }
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index a03a65ebcf0c..c9f6077b615e 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -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;