diff options
| author | Florian Westphal <fw@strlen.de> | 2016-05-03 10:33:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-04 14:16:49 -0400 |
| commit | 860e9538a9482bb84589f7d0718a7e6d0a944d58 (patch) | |
| tree | 0bb6a166267299aadb498c2d857f38233d615809 /drivers/net/wan | |
| parent | ba162f8eed61a7e71e26455ce1cff5b5898a3579 (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/wan')
| -rw-r--r-- | drivers/net/wan/cosa.c | 2 | ||||
| -rw-r--r-- | drivers/net/wan/farsync.c | 6 | ||||
| -rw-r--r-- | drivers/net/wan/lmc/lmc_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/wan/sbni.c | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 848ea6a399f2..b87fe0a01c69 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c | |||
| @@ -739,7 +739,7 @@ static char *cosa_net_setup_rx(struct channel_data *chan, int size) | |||
| 739 | chan->netdev->stats.rx_dropped++; | 739 | chan->netdev->stats.rx_dropped++; |
| 740 | return NULL; | 740 | return NULL; |
| 741 | } | 741 | } |
| 742 | chan->netdev->trans_start = jiffies; | 742 | netif_trans_update(chan->netdev); |
| 743 | return skb_put(chan->rx_skb, size); | 743 | return skb_put(chan->rx_skb, size); |
| 744 | } | 744 | } |
| 745 | 745 | ||
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 69b994f3b8c5..3c9cbf908ec7 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c | |||
| @@ -831,7 +831,7 @@ fst_tx_dma_complete(struct fst_card_info *card, struct fst_port_info *port, | |||
| 831 | DMA_OWN | TX_STP | TX_ENP); | 831 | DMA_OWN | TX_STP | TX_ENP); |
| 832 | dev->stats.tx_packets++; | 832 | dev->stats.tx_packets++; |
| 833 | dev->stats.tx_bytes += len; | 833 | dev->stats.tx_bytes += len; |
| 834 | dev->trans_start = jiffies; | 834 | netif_trans_update(dev); |
| 835 | } | 835 | } |
| 836 | 836 | ||
| 837 | /* | 837 | /* |
| @@ -1389,7 +1389,7 @@ do_bottom_half_tx(struct fst_card_info *card) | |||
| 1389 | DMA_OWN | TX_STP | TX_ENP); | 1389 | DMA_OWN | TX_STP | TX_ENP); |
| 1390 | dev->stats.tx_packets++; | 1390 | dev->stats.tx_packets++; |
| 1391 | dev->stats.tx_bytes += skb->len; | 1391 | dev->stats.tx_bytes += skb->len; |
| 1392 | dev->trans_start = jiffies; | 1392 | netif_trans_update(dev); |
| 1393 | } else { | 1393 | } else { |
| 1394 | /* Or do it through dma */ | 1394 | /* Or do it through dma */ |
| 1395 | memcpy(card->tx_dma_handle_host, | 1395 | memcpy(card->tx_dma_handle_host, |
| @@ -2258,7 +2258,7 @@ fst_tx_timeout(struct net_device *dev) | |||
| 2258 | card->card_no, port->index); | 2258 | card->card_no, port->index); |
| 2259 | fst_issue_cmd(port, ABORTTX); | 2259 | fst_issue_cmd(port, ABORTTX); |
| 2260 | 2260 | ||
| 2261 | dev->trans_start = jiffies; | 2261 | netif_trans_update(dev); |
| 2262 | netif_wake_queue(dev); | 2262 | netif_wake_queue(dev); |
| 2263 | port->start = 0; | 2263 | port->start = 0; |
| 2264 | } | 2264 | } |
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index bb33b242ab48..299140c04556 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c | |||
| @@ -2105,7 +2105,7 @@ static void lmc_driver_timeout(struct net_device *dev) | |||
| 2105 | sc->lmc_device->stats.tx_errors++; | 2105 | sc->lmc_device->stats.tx_errors++; |
| 2106 | sc->extra_stats.tx_ProcTimeout++; /* -baz */ | 2106 | sc->extra_stats.tx_ProcTimeout++; /* -baz */ |
| 2107 | 2107 | ||
| 2108 | dev->trans_start = jiffies; /* prevent tx timeout */ | 2108 | netif_trans_update(dev); /* prevent tx timeout */ |
| 2109 | 2109 | ||
| 2110 | bug_out: | 2110 | bug_out: |
| 2111 | 2111 | ||
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index 8fef8d83436d..d98c7e57137d 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c | |||
| @@ -860,9 +860,9 @@ prepare_to_send( struct sk_buff *skb, struct net_device *dev ) | |||
| 860 | 860 | ||
| 861 | outb( inb( dev->base_addr + CSR0 ) | TR_REQ, dev->base_addr + CSR0 ); | 861 | outb( inb( dev->base_addr + CSR0 ) | TR_REQ, dev->base_addr + CSR0 ); |
| 862 | #ifdef CONFIG_SBNI_MULTILINE | 862 | #ifdef CONFIG_SBNI_MULTILINE |
| 863 | nl->master->trans_start = jiffies; | 863 | netif_trans_update(nl->master); |
| 864 | #else | 864 | #else |
| 865 | dev->trans_start = jiffies; | 865 | netif_trans_update(dev); |
| 866 | #endif | 866 | #endif |
| 867 | } | 867 | } |
| 868 | 868 | ||
| @@ -889,10 +889,10 @@ drop_xmit_queue( struct net_device *dev ) | |||
| 889 | nl->state &= ~(FL_WAIT_ACK | FL_NEED_RESEND); | 889 | nl->state &= ~(FL_WAIT_ACK | FL_NEED_RESEND); |
| 890 | #ifdef CONFIG_SBNI_MULTILINE | 890 | #ifdef CONFIG_SBNI_MULTILINE |
| 891 | netif_start_queue( nl->master ); | 891 | netif_start_queue( nl->master ); |
| 892 | nl->master->trans_start = jiffies; | 892 | netif_trans_update(nl->master); |
| 893 | #else | 893 | #else |
| 894 | netif_start_queue( dev ); | 894 | netif_start_queue( dev ); |
| 895 | dev->trans_start = jiffies; | 895 | netif_trans_update(dev); |
| 896 | #endif | 896 | #endif |
| 897 | } | 897 | } |
| 898 | 898 | ||
