Merge branch 'ipoib' into for-next

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
index e9795f60e5d684d12afd707d8b07c46ad28260a1..d10b4ec68d28ad48ab0a637ba6d1883039ab7bdb 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
@@ -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;