diff options
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 10 |
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, | |||
| 55 | struct ipoib_dev_priv *priv = netdev_priv(dev); | 55 | struct ipoib_dev_priv *priv = netdev_priv(dev); |
| 56 | 56 | ||
| 57 | coal->rx_coalesce_usecs = priv->ethtool.coalesce_usecs; | 57 | coal->rx_coalesce_usecs = priv->ethtool.coalesce_usecs; |
| 58 | coal->tx_coalesce_usecs = priv->ethtool.coalesce_usecs; | ||
| 59 | coal->rx_max_coalesced_frames = priv->ethtool.max_coalesced_frames; | 58 | coal->rx_max_coalesced_frames = priv->ethtool.max_coalesced_frames; |
| 60 | coal->tx_max_coalesced_frames = priv->ethtool.max_coalesced_frames; | ||
| 61 | 59 | ||
| 62 | return 0; | 60 | return 0; |
| 63 | } | 61 | } |
| @@ -69,10 +67,8 @@ static int ipoib_set_coalesce(struct net_device *dev, | |||
| 69 | int ret; | 67 | int ret; |
| 70 | 68 | ||
| 71 | /* | 69 | /* |
| 72 | * Since IPoIB uses a single CQ for both rx and tx, we assume | 70 | * These values are saved in the private data and returned |
| 73 | * that rx params dictate the configuration. These values are | 71 | * when ipoib_get_coalesce() is called |
| 74 | * saved in the private data and returned when ipoib_get_coalesce() | ||
| 75 | * is called. | ||
| 76 | */ | 72 | */ |
| 77 | if (coal->rx_coalesce_usecs > 0xffff || | 73 | if (coal->rx_coalesce_usecs > 0xffff || |
| 78 | coal->rx_max_coalesced_frames > 0xffff) | 74 | coal->rx_max_coalesced_frames > 0xffff) |
| @@ -85,8 +81,6 @@ static int ipoib_set_coalesce(struct net_device *dev, | |||
| 85 | return ret; | 81 | return ret; |
| 86 | } | 82 | } |
| 87 | 83 | ||
| 88 | coal->tx_coalesce_usecs = coal->rx_coalesce_usecs; | ||
| 89 | coal->tx_max_coalesced_frames = coal->rx_max_coalesced_frames; | ||
| 90 | priv->ethtool.coalesce_usecs = coal->rx_coalesce_usecs; | 84 | priv->ethtool.coalesce_usecs = coal->rx_coalesce_usecs; |
| 91 | priv->ethtool.max_coalesced_frames = coal->rx_max_coalesced_frames; | 85 | priv->ethtool.max_coalesced_frames = coal->rx_max_coalesced_frames; |
| 92 | 86 | ||
