summaryrefslogtreecommitdiffstats
path: root/drivers/net/fjes
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-05-03 16:30:59 +0200
committerDavid S. Miller <davem@davemloft.net>2016-05-04 20:16:47 +0200
commit4d0e965732db6f7cce78e6b8f5d3073249004c3a (patch)
tree5b9669cf865a386f3e1943c8e1db39dfdaeecfd6 /drivers/net/fjes
parentdmfe: kill DEVICE define (diff)
downloadlinux-4d0e965732db6f7cce78e6b8f5d3073249004c3a.tar.xz
linux-4d0e965732db6f7cce78e6b8f5d3073249004c3a.zip
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/net/fjes')
-rw-r--r--drivers/net/fjes/fjes_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fjes/fjes_main.c b/drivers/net/fjes/fjes_main.c
index bb7e90368f8f..7ad3d04314c5 100644
--- a/drivers/net/fjes/fjes_main.c
+++ b/drivers/net/fjes/fjes_main.c
@@ -471,7 +471,7 @@ static void fjes_tx_stall_task(struct work_struct *work)
int i;
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);
return;
}