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: (48 commits)
  IB/srp: Clean up error path in srp_create_target_ib()
  IB/srp: Split send and recieve CQs to reduce number of interrupts
  RDMA/nes: Add support for KR device id 0x0110
  IB/uverbs: Use anon_inodes instead of private infinibandeventfs
  IB/core: Fix and clean up ib_ud_header_init()
  RDMA/cxgb3: Mark RDMA device with CXIO_ERROR_FATAL when removing
  RDMA/cxgb3: Don't allocate the SW queue for user mode CQs
  RDMA/cxgb3: Increase the max CQ depth
  RDMA/cxgb3: Doorbell overflow avoidance and recovery
  IB/core: Pack struct ib_device a little tighter
  IB/ucm: Clean whitespace errors
  IB/ucm: Increase maximum devices supported
  IB/ucm: Use stack variable 'base' in ib_ucm_add_one
  IB/ucm: Use stack variable 'devnum' in ib_ucm_add_one
  IB/umad: Clean whitespace
  IB/umad: Increase maximum devices supported
  IB/umad: Use stack variable 'base' in ib_umad_init_port
  IB/umad: Use stack variable 'devnum' in ib_umad_init_port
  IB/umad: Remove port_table[]
  IB/umad: Convert *cdev to cdev in struct ib_umad_port
  ...

1 files changed, 2 insertions, 8 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
index e9795f60e5d6..d10b4ec68d28 100644
--- 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;