aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/cavium
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/cavium
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/cavium')
-rw-r--r--drivers/net/ethernet/cavium/liquidio/lio_main.c4
-rw-r--r--drivers/net/ethernet/cavium/octeon/octeon_mgmt.c2
-rw-r--r--drivers/net/ethernet/cavium/thunder/nicvf_main.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 34d269cd5579..8de79ae63231 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -2899,7 +2899,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)
2899 if (status == IQ_SEND_STOP) 2899 if (status == IQ_SEND_STOP)
2900 stop_q(lio->netdev, q_idx); 2900 stop_q(lio->netdev, q_idx);
2901 2901
2902 netdev->trans_start = jiffies; 2902 netif_trans_update(netdev);
2903 2903
2904 stats->tx_done++; 2904 stats->tx_done++;
2905 stats->tx_tot_bytes += skb->len; 2905 stats->tx_tot_bytes += skb->len;
@@ -2928,7 +2928,7 @@ static void liquidio_tx_timeout(struct net_device *netdev)
2928 netif_info(lio, tx_err, lio->netdev, 2928 netif_info(lio, tx_err, lio->netdev,
2929 "Transmit timeout tx_dropped:%ld, waking up queues now!!\n", 2929 "Transmit timeout tx_dropped:%ld, waking up queues now!!\n",
2930 netdev->stats.tx_dropped); 2930 netdev->stats.tx_dropped);
2931 netdev->trans_start = jiffies; 2931 netif_trans_update(netdev);
2932 txqs_wake(netdev); 2932 txqs_wake(netdev);
2933} 2933}
2934 2934
diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
index c177c7cec13b..388cd799d9ed 100644
--- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
@@ -1320,7 +1320,7 @@ static int octeon_mgmt_xmit(struct sk_buff *skb, struct net_device *netdev)
1320 /* Ring the bell. */ 1320 /* Ring the bell. */
1321 cvmx_write_csr(p->mix + MIX_ORING2, 1); 1321 cvmx_write_csr(p->mix + MIX_ORING2, 1);
1322 1322
1323 netdev->trans_start = jiffies; 1323 netif_trans_update(netdev);
1324 rv = NETDEV_TX_OK; 1324 rv = NETDEV_TX_OK;
1325out: 1325out:
1326 octeon_mgmt_update_tx_stats(netdev); 1326 octeon_mgmt_update_tx_stats(netdev);
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
index bfee298fc02a..a19e73f11d73 100644
--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@ -1442,7 +1442,7 @@ static void nicvf_reset_task(struct work_struct *work)
1442 1442
1443 nicvf_stop(nic->netdev); 1443 nicvf_stop(nic->netdev);
1444 nicvf_open(nic->netdev); 1444 nicvf_open(nic->netdev);
1445 nic->netdev->trans_start = jiffies; 1445 netif_trans_update(nic->netdev);
1446} 1446}
1447 1447
1448static int nicvf_config_loopback(struct nicvf *nic, 1448static int nicvf_config_loopback(struct nicvf *nic,