Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92d499d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1811534a b1812582

drivers/infiniband/hw/ehca/ehca_av.c

+6 −2
Original line number Diff line number Diff line
@@ -76,6 +76,10 @@ int ehca_calc_ipd(struct ehca_shca *shca, int port, 


	link = ib_width_enum_to_int(pa.active_width) * pa.active_speed;



	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;

drivers/infiniband/ulp/ipoib/ipoib_main.c

+3 −0
Original line number Diff line number Diff line
@@ -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;