Commit 4d0e9657 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller

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: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6e5472d
...@@ -1036,7 +1036,7 @@ static void ipoib_timeout(struct net_device *dev) ...@@ -1036,7 +1036,7 @@ static void ipoib_timeout(struct net_device *dev)
struct ipoib_dev_priv *priv = netdev_priv(dev); struct ipoib_dev_priv *priv = netdev_priv(dev);
ipoib_warn(priv, "transmit timeout: latency %d msecs\n", ipoib_warn(priv, "transmit timeout: latency %d msecs\n",
jiffies_to_msecs(jiffies - dev->trans_start)); jiffies_to_msecs(jiffies - dev_trans_start(dev)));
ipoib_warn(priv, "queue stopped %d, tx_head %u, tx_tail %u\n", ipoib_warn(priv, "queue stopped %d, tx_head %u, tx_tail %u\n",
netif_queue_stopped(dev), netif_queue_stopped(dev),
priv->tx_head, priv->tx_tail); priv->tx_head, priv->tx_tail);
......
...@@ -242,7 +242,7 @@ static void e1000e_dump(struct e1000_adapter *adapter) ...@@ -242,7 +242,7 @@ static void e1000e_dump(struct e1000_adapter *adapter)
dev_info(&adapter->pdev->dev, "Net device Info\n"); dev_info(&adapter->pdev->dev, "Net device Info\n");
pr_info("Device Name state trans_start last_rx\n"); pr_info("Device Name state trans_start last_rx\n");
pr_info("%-15s %016lX %016lX %016lX\n", netdev->name, pr_info("%-15s %016lX %016lX %016lX\n", netdev->name,
netdev->state, netdev->trans_start, netdev->last_rx); netdev->state, dev_trans_start(netdev), netdev->last_rx);
} }
/* Print Registers */ /* Print Registers */
......
...@@ -383,7 +383,7 @@ static void igb_dump(struct igb_adapter *adapter) ...@@ -383,7 +383,7 @@ static void igb_dump(struct igb_adapter *adapter)
dev_info(&adapter->pdev->dev, "Net device Info\n"); dev_info(&adapter->pdev->dev, "Net device Info\n");
pr_info("Device Name state trans_start last_rx\n"); pr_info("Device Name state trans_start last_rx\n");
pr_info("%-15s %016lX %016lX %016lX\n", netdev->name, pr_info("%-15s %016lX %016lX %016lX\n", netdev->name,
netdev->state, netdev->trans_start, netdev->last_rx); netdev->state, dev_trans_start(netdev), netdev->last_rx);
} }
/* Print Registers */ /* Print Registers */
......
...@@ -608,7 +608,7 @@ static void ixgbe_dump(struct ixgbe_adapter *adapter) ...@@ -608,7 +608,7 @@ static void ixgbe_dump(struct ixgbe_adapter *adapter)
pr_info("%-15s %016lX %016lX %016lX\n", pr_info("%-15s %016lX %016lX %016lX\n",
netdev->name, netdev->name,
netdev->state, netdev->state,
netdev->trans_start, dev_trans_start(netdev),
netdev->last_rx); netdev->last_rx);
} }
......
...@@ -890,7 +890,7 @@ static void encx24j600_tx_timeout(struct net_device *dev) ...@@ -890,7 +890,7 @@ static void encx24j600_tx_timeout(struct net_device *dev)
struct encx24j600_priv *priv = netdev_priv(dev); struct encx24j600_priv *priv = netdev_priv(dev);
netif_err(priv, tx_err, dev, "TX timeout at %ld, latency %ld\n", netif_err(priv, tx_err, dev, "TX timeout at %ld, latency %ld\n",
jiffies, jiffies - dev->trans_start); jiffies, jiffies - dev_trans_start(dev));
dev->stats.tx_errors++; dev->stats.tx_errors++;
netif_wake_queue(dev); netif_wake_queue(dev);
......
...@@ -734,7 +734,7 @@ qcaspi_netdev_tx_timeout(struct net_device *dev) ...@@ -734,7 +734,7 @@ qcaspi_netdev_tx_timeout(struct net_device *dev)
struct qcaspi *qca = netdev_priv(dev); struct qcaspi *qca = netdev_priv(dev);
netdev_info(qca->net_dev, "Transmit timeout at %ld, latency %ld\n", netdev_info(qca->net_dev, "Transmit timeout at %ld, latency %ld\n",
jiffies, jiffies - dev->trans_start); jiffies, jiffies - dev_trans_start(dev));
qca->net_dev->stats.tx_errors++; qca->net_dev->stats.tx_errors++;
/* Trigger tx queue flush and QCA7000 reset */ /* Trigger tx queue flush and QCA7000 reset */
qca->sync = QCASPI_SYNC_UNKNOWN; qca->sync = QCASPI_SYNC_UNKNOWN;
......
...@@ -471,7 +471,7 @@ static void fjes_tx_stall_task(struct work_struct *work) ...@@ -471,7 +471,7 @@ static void fjes_tx_stall_task(struct work_struct *work)
int i; int i;
if (((long)jiffies - if (((long)jiffies -
(long)(netdev->trans_start)) > FJES_TX_TX_STALL_TIMEOUT) { dev_trans_start(netdev)) > FJES_TX_TX_STALL_TIMEOUT) {
netif_wake_queue(netdev); netif_wake_queue(netdev);
return; return;
} }
......
...@@ -542,7 +542,7 @@ static netdev_tx_t ax_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -542,7 +542,7 @@ static netdev_tx_t ax_xmit(struct sk_buff *skb, struct net_device *dev)
* May be we must check transmitter timeout here ? * May be we must check transmitter timeout here ?
* 14 Oct 1994 Dmitry Gorodchanin. * 14 Oct 1994 Dmitry Gorodchanin.
*/ */
if (time_before(jiffies, dev->trans_start + 20 * HZ)) { if (time_before(jiffies, dev_trans_start(dev) + 20 * HZ)) {
/* 20 sec timeout not reached */ /* 20 sec timeout not reached */
return NETDEV_TX_BUSY; return NETDEV_TX_BUSY;
} }
......
...@@ -1991,7 +1991,7 @@ static short rtllib_sta_ps_sleep(struct rtllib_device *ieee, u64 *time) ...@@ -1991,7 +1991,7 @@ static short rtllib_sta_ps_sleep(struct rtllib_device *ieee, u64 *time)
return 2; return 2;
if (!time_after(jiffies, if (!time_after(jiffies,
ieee->dev->trans_start + msecs_to_jiffies(timeout))) dev_trans_start(ieee->dev) + msecs_to_jiffies(timeout)))
return 0; return 0;
if (!time_after(jiffies, if (!time_after(jiffies,
ieee->last_rx_ps_time + msecs_to_jiffies(timeout))) ieee->last_rx_ps_time + msecs_to_jiffies(timeout)))
......
...@@ -1737,7 +1737,7 @@ static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, ...@@ -1737,7 +1737,7 @@ static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h,
return 2; return 2;
if(!time_after(jiffies, if(!time_after(jiffies,
ieee->dev->trans_start + msecs_to_jiffies(timeout))) dev_trans_start(ieee->dev) + msecs_to_jiffies(timeout)))
return 0; return 0;
if(!time_after(jiffies, if(!time_after(jiffies,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment