diff options
| author | Florian Westphal <fw@strlen.de> | 2016-05-03 10:30:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-04 14:16:47 -0400 |
| commit | 4d0e965732db6f7cce78e6b8f5d3073249004c3a (patch) | |
| tree | 5b9669cf865a386f3e1943c8e1db39dfdaeecfd6 /drivers/infiniband/ulp/ipoib | |
| parent | a6e5472dc3d99201d0f59dd4d1faf0dcf7d978c3 (diff) | |
drivers: replace dev->trans_start accesses with dev_trans_start
a trans_start struct member exists twice:
- in struct net_device (legacy)
- in struct netdev_queue
Instead of open-coding dev->trans_start usage to obtain the current
trans_start value, use dev_trans_start() instead.
This is not exactly the same, as dev_trans_start also considers
the trans_start values of the netdev queues owned by the device
and provides the most recent one.
For legacy devices this doesn't matter as dev_trans_start can cope
with netdev trans_start values of 0 (they are ignored).
This is a prerequisite to eventual removal of dev->trans_start.
Cc: linux-rdma@vger.kernel.org
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index 80807d6e5c4c..b940ef1c19c7 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c | |||
| @@ -1036,7 +1036,7 @@ static void ipoib_timeout(struct net_device *dev) | |||
| 1036 | struct ipoib_dev_priv *priv = netdev_priv(dev); | 1036 | struct ipoib_dev_priv *priv = netdev_priv(dev); |
| 1037 | 1037 | ||
| 1038 | ipoib_warn(priv, "transmit timeout: latency %d msecs\n", | 1038 | ipoib_warn(priv, "transmit timeout: latency %d msecs\n", |
| 1039 | jiffies_to_msecs(jiffies - dev->trans_start)); | 1039 | jiffies_to_msecs(jiffies - dev_trans_start(dev))); |
| 1040 | ipoib_warn(priv, "queue stopped %d, tx_head %u, tx_tail %u\n", | 1040 | ipoib_warn(priv, "queue stopped %d, tx_head %u, tx_tail %u\n", |
| 1041 | netif_queue_stopped(dev), | 1041 | netif_queue_stopped(dev), |
| 1042 | priv->tx_head, priv->tx_tail); | 1042 | priv->tx_head, priv->tx_tail); |
