aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ibm
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-05-03 10:33:13 -0400
committerDavid S. Miller <davem@davemloft.net>2016-05-04 14:16:49 -0400
commit860e9538a9482bb84589f7d0718a7e6d0a944d58 (patch)
tree0bb6a166267299aadb498c2d857f38233d615809 /drivers/net/ethernet/ibm
parentba162f8eed61a7e71e26455ce1cff5b5898a3579 (diff)
treewide: replace dev->trans_start update with helper
Replace all trans_start updates with netif_trans_update helper. change was done via spatch: struct net_device *d; @@ - d->trans_start = jiffies + netif_trans_update(d) Compile tested only. Cc: user-mode-linux-devel@lists.sourceforge.net Cc: linux-xtensa@linux-xtensa.org Cc: linux1394-devel@lists.sourceforge.net Cc: linux-rdma@vger.kernel.org Cc: netdev@vger.kernel.org Cc: MPT-FusionLinux.pdl@broadcom.com Cc: linux-scsi@vger.kernel.org Cc: linux-can@vger.kernel.org Cc: linux-parisc@vger.kernel.org Cc: linux-omap@vger.kernel.org Cc: linux-hams@vger.kernel.org Cc: linux-usb@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: linux-s390@vger.kernel.org Cc: devel@driverdev.osuosl.org Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: linux-bluetooth@vger.kernel.org Signed-off-by: Florian Westphal <fw@strlen.de> Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com> Acked-by: Mugunthan V N <mugunthanvnm@ti.com> Acked-by: Antonio Quartulli <a@unstable.cc> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm')
-rw-r--r--drivers/net/ethernet/ibm/emac/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index 5d7db6c01c46..4c9771d57d6e 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -301,7 +301,7 @@ static inline void emac_netif_stop(struct emac_instance *dev)
301 dev->no_mcast = 1; 301 dev->no_mcast = 1;
302 netif_addr_unlock(dev->ndev); 302 netif_addr_unlock(dev->ndev);
303 netif_tx_unlock_bh(dev->ndev); 303 netif_tx_unlock_bh(dev->ndev);
304 dev->ndev->trans_start = jiffies; /* prevent tx timeout */ 304 netif_trans_update(dev->ndev); /* prevent tx timeout */
305 mal_poll_disable(dev->mal, &dev->commac); 305 mal_poll_disable(dev->mal, &dev->commac);
306 netif_tx_disable(dev->ndev); 306 netif_tx_disable(dev->ndev);
307} 307}
@@ -1377,7 +1377,7 @@ static inline int emac_xmit_finish(struct emac_instance *dev, int len)
1377 DBG2(dev, "stopped TX queue" NL); 1377 DBG2(dev, "stopped TX queue" NL);
1378 } 1378 }
1379 1379
1380 ndev->trans_start = jiffies; 1380 netif_trans_update(ndev);
1381 ++dev->stats.tx_packets; 1381 ++dev->stats.tx_packets;
1382 dev->stats.tx_bytes += len; 1382 dev->stats.tx_bytes += len;
1383 1383