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

Commit 7f168162 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branch 'ipoib' into for-next

parents 85f938a7 757bebb3

drivers/infiniband/ulp/ipoib/ipoib_ethtool.c

+2 −8
Original line number Diff line number Diff line
@@ -55,9 +55,7 @@ static int ipoib_get_coalesce(struct net_device *dev, 
	struct ipoib_dev_priv *priv = netdev_priv(dev);



	coal->rx_coalesce_usecs = priv->ethtool.coalesce_usecs;

	coal->tx_coalesce_usecs = priv->ethtool.coalesce_usecs;

	coal->rx_max_coalesced_frames = priv->ethtool.max_coalesced_frames;

	coal->tx_max_coalesced_frames = priv->ethtool.max_coalesced_frames;



	return 0;

}
@@ -69,10 +67,8 @@ static int ipoib_set_coalesce(struct net_device *dev, 
	int ret;



	/*

	 * Since IPoIB uses a single CQ for both rx and tx, we assume

	 * that rx params dictate the configuration.  These values are

	 * saved in the private data and returned when ipoib_get_coalesce()

	 * is called.

	 * These values are saved in the private data and returned

	 * when ipoib_get_coalesce() is called

	 */

	if (coal->rx_coalesce_usecs       > 0xffff ||

	    coal->rx_max_coalesced_frames > 0xffff)
@@ -85,8 +81,6 @@ static int ipoib_set_coalesce(struct net_device *dev, 
		return ret;

	}



	coal->tx_coalesce_usecs       = coal->rx_coalesce_usecs;

	coal->tx_max_coalesced_frames = coal->rx_max_coalesced_frames;

	priv->ethtool.coalesce_usecs       = coal->rx_coalesce_usecs;

	priv->ethtool.max_coalesced_frames = coal->rx_max_coalesced_frames;