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/usb | |
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/usb')
-rw-r--r-- | drivers/net/usb/catc.c | 4 | ||||
-rw-r--r-- | drivers/net/usb/kaweth.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/lan78xx.c | 4 | ||||
-rw-r--r-- | drivers/net/usb/pegasus.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/rtl8150.c | 4 | ||||
-rw-r--r-- | drivers/net/usb/usbnet.c | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c index 4e2b26a88b15..d9ca05d3ac8e 100644 --- a/drivers/net/usb/catc.c +++ b/drivers/net/usb/catc.c | |||
@@ -376,7 +376,7 @@ static int catc_tx_run(struct catc *catc) | |||
376 | catc->tx_idx = !catc->tx_idx; | 376 | catc->tx_idx = !catc->tx_idx; |
377 | catc->tx_ptr = 0; | 377 | catc->tx_ptr = 0; |
378 | 378 | ||
379 | catc->netdev->trans_start = jiffies; | 379 | netif_trans_update(catc->netdev); |
380 | return status; | 380 | return status; |
381 | } | 381 | } |
382 | 382 | ||
@@ -389,7 +389,7 @@ static void catc_tx_done(struct urb *urb) | |||
389 | if (status == -ECONNRESET) { | 389 | if (status == -ECONNRESET) { |
390 | dev_dbg(&urb->dev->dev, "Tx Reset.\n"); | 390 | dev_dbg(&urb->dev->dev, "Tx Reset.\n"); |
391 | urb->status = 0; | 391 | urb->status = 0; |
392 | catc->netdev->trans_start = jiffies; | 392 | netif_trans_update(catc->netdev); |
393 | catc->netdev->stats.tx_errors++; | 393 | catc->netdev->stats.tx_errors++; |
394 | clear_bit(TX_RUNNING, &catc->flags); | 394 | clear_bit(TX_RUNNING, &catc->flags); |
395 | netif_wake_queue(catc->netdev); | 395 | netif_wake_queue(catc->netdev); |
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index f64b25c221e8..770212baaf05 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c | |||
@@ -938,7 +938,7 @@ static void kaweth_tx_timeout(struct net_device *net) | |||
938 | 938 | ||
939 | dev_warn(&net->dev, "%s: Tx timed out. Resetting.\n", net->name); | 939 | dev_warn(&net->dev, "%s: Tx timed out. Resetting.\n", net->name); |
940 | kaweth->stats.tx_errors++; | 940 | kaweth->stats.tx_errors++; |
941 | net->trans_start = jiffies; | 941 | netif_trans_update(net); |
942 | 942 | ||
943 | usb_unlink_urb(kaweth->tx_urb); | 943 | usb_unlink_urb(kaweth->tx_urb); |
944 | } | 944 | } |
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index f64778ad9753..6a9d474b08b2 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c | |||
@@ -3045,7 +3045,7 @@ gso_skb: | |||
3045 | ret = usb_submit_urb(urb, GFP_ATOMIC); | 3045 | ret = usb_submit_urb(urb, GFP_ATOMIC); |
3046 | switch (ret) { | 3046 | switch (ret) { |
3047 | case 0: | 3047 | case 0: |
3048 | dev->net->trans_start = jiffies; | 3048 | netif_trans_update(dev->net); |
3049 | lan78xx_queue_skb(&dev->txq, skb, tx_start); | 3049 | lan78xx_queue_skb(&dev->txq, skb, tx_start); |
3050 | if (skb_queue_len(&dev->txq) >= dev->tx_qlen) | 3050 | if (skb_queue_len(&dev->txq) >= dev->tx_qlen) |
3051 | netif_stop_queue(dev->net); | 3051 | netif_stop_queue(dev->net); |
@@ -3729,7 +3729,7 @@ int lan78xx_resume(struct usb_interface *intf) | |||
3729 | usb_free_urb(res); | 3729 | usb_free_urb(res); |
3730 | usb_autopm_put_interface_async(dev->intf); | 3730 | usb_autopm_put_interface_async(dev->intf); |
3731 | } else { | 3731 | } else { |
3732 | dev->net->trans_start = jiffies; | 3732 | netif_trans_update(dev->net); |
3733 | lan78xx_queue_skb(&dev->txq, skb, tx_start); | 3733 | lan78xx_queue_skb(&dev->txq, skb, tx_start); |
3734 | } | 3734 | } |
3735 | } | 3735 | } |
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 82129eef7774..36cd7f016a8d 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c | |||
@@ -615,7 +615,7 @@ static void write_bulk_callback(struct urb *urb) | |||
615 | break; | 615 | break; |
616 | } | 616 | } |
617 | 617 | ||
618 | net->trans_start = jiffies; /* prevent tx timeout */ | 618 | netif_trans_update(net); /* prevent tx timeout */ |
619 | netif_wake_queue(net); | 619 | netif_wake_queue(net); |
620 | } | 620 | } |
621 | 621 | ||
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index d37b7dce2d40..7c72bfac89d0 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c | |||
@@ -451,7 +451,7 @@ static void write_bulk_callback(struct urb *urb) | |||
451 | if (status) | 451 | if (status) |
452 | dev_info(&urb->dev->dev, "%s: Tx status %d\n", | 452 | dev_info(&urb->dev->dev, "%s: Tx status %d\n", |
453 | dev->netdev->name, status); | 453 | dev->netdev->name, status); |
454 | dev->netdev->trans_start = jiffies; | 454 | netif_trans_update(dev->netdev); |
455 | netif_wake_queue(dev->netdev); | 455 | netif_wake_queue(dev->netdev); |
456 | } | 456 | } |
457 | 457 | ||
@@ -694,7 +694,7 @@ static netdev_tx_t rtl8150_start_xmit(struct sk_buff *skb, | |||
694 | } else { | 694 | } else { |
695 | netdev->stats.tx_packets++; | 695 | netdev->stats.tx_packets++; |
696 | netdev->stats.tx_bytes += skb->len; | 696 | netdev->stats.tx_bytes += skb->len; |
697 | netdev->trans_start = jiffies; | 697 | netif_trans_update(netdev); |
698 | } | 698 | } |
699 | 699 | ||
700 | return NETDEV_TX_OK; | 700 | return NETDEV_TX_OK; |
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 4837854fd43c..61ba46404937 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
@@ -1416,7 +1416,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, | |||
1416 | "tx: submit urb err %d\n", retval); | 1416 | "tx: submit urb err %d\n", retval); |
1417 | break; | 1417 | break; |
1418 | case 0: | 1418 | case 0: |
1419 | net->trans_start = jiffies; | 1419 | netif_trans_update(net); |
1420 | __usbnet_queue_skb(&dev->txq, skb, tx_start); | 1420 | __usbnet_queue_skb(&dev->txq, skb, tx_start); |
1421 | if (dev->txq.qlen >= TX_QLEN (dev)) | 1421 | if (dev->txq.qlen >= TX_QLEN (dev)) |
1422 | netif_stop_queue (net); | 1422 | netif_stop_queue (net); |
@@ -1845,7 +1845,7 @@ int usbnet_resume (struct usb_interface *intf) | |||
1845 | usb_free_urb(res); | 1845 | usb_free_urb(res); |
1846 | usb_autopm_put_interface_async(dev->intf); | 1846 | usb_autopm_put_interface_async(dev->intf); |
1847 | } else { | 1847 | } else { |
1848 | dev->net->trans_start = jiffies; | 1848 | netif_trans_update(dev->net); |
1849 | __skb_queue_tail(&dev->txq, skb); | 1849 | __skb_queue_tail(&dev->txq, skb); |
1850 | } | 1850 | } |
1851 | } | 1851 | } |